diff options
author | Colin Cross <ccross@android.com> | 2019-03-22 13:55:03 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-22 13:55:03 -0700 |
commit | b882fddd0b4079fa8b28df5d8a9de0e96ea7686e (patch) | |
tree | 9159ef66bd6dd746709e3627a186e1c6cfec61d8 | |
parent | b1d4a0d26b9d704a5898a680fa2b556fca1796a5 (diff) | |
parent | 3e8c12aba8b34a9f00453569a0693b922f387f13 (diff) | |
download | crcalc-b882fddd0b4079fa8b28df5d8a9de0e96ea7686e.tar.gz |
Convert external/crcalc to Android.bpandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13
am: 3e8c12aba8
Change-Id: I92dd1613c1a4fba2691a20c0610bf657a123626a
-rw-r--r-- | Android.bp | 26 | ||||
-rw-r--r-- | Android.mk | 32 | ||||
-rw-r--r-- | tests/Android.bp | 26 | ||||
-rw-r--r-- | tests/Android.mk | 30 |
4 files changed, 52 insertions, 62 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..3020f7b --- /dev/null +++ b/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2014 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Other files in this directory carry a different license. + +// build the client library +//------------------------------- +java_library { + name: "cr", + + srcs: ["src/**/*.java"], + + sdk_version: "19", + +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index b78e9e1..0000000 --- a/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2014 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Other files in this directory carry a different license. - -LOCAL_PATH := $(call my-dir) - -# build the client library -#------------------------------- -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE := cr -LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := 19 - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) - diff --git a/tests/Android.bp b/tests/Android.bp new file mode 100644 index 0000000..c8e308c --- /dev/null +++ b/tests/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2015 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// Other files in this directory carry a different license. + +// build the test apk +//------------------------------- +android_test { + name: "CRTests", + sdk_version: "19", + srcs: [ + "src/**/*.java", + ], + static_libs: ["cr"], +} diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index 441752e..0000000 --- a/tests/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Other files in this directory carry a different license. - -LOCAL_PATH := $(call my-dir) - -# build the test apk -#------------------------------- -include $(CLEAR_VARS) - -LOCAL_PACKAGE_NAME := CRTests -LOCAL_SDK_VERSION := 19 -LOCAL_MODULE_TAGS := tests -LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-java-files-under, ../src) -# Empirically, LOCAL_INSTRUMENTATION_FOR doesn't work, perhaps because it -# expects an apk, not a library. - -include $(BUILD_PACKAGE) |