diff options
author | Dan Willemsen <dwillemsen@google.com> | 2019-03-24 22:30:24 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-24 22:30:24 -0700 |
commit | d197e5e045630cfbcfc9313c95fcbbde61fb2bfc (patch) | |
tree | dbdfa1a5e871697ec4088b3d09987953b987a8d8 | |
parent | 3a21a27ca35ba0782c720da64e4a16d0c9e706d5 (diff) | |
parent | ad87eb4c4cf38232445ff1905be1f645ce8fd391 (diff) | |
download | framework-android10-qpr1-b-s1-release.tar.gz |
Convert to Android.bp am: cf86673c9f am: c3e7ee4f69q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r10android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-release
am: ad87eb4c4c
Change-Id: I01cb6a395988b38239f57d473027c9a850928c04
-rw-r--r-- | harnesses/Android.bp | 20 | ||||
-rw-r--r-- | harnesses/Android.mk | 26 | ||||
-rw-r--r-- | tools/host_controller/Android.bp | 18 | ||||
-rw-r--r-- | tools/host_controller/Android.mk | 21 |
4 files changed, 38 insertions, 47 deletions
diff --git a/harnesses/Android.bp b/harnesses/Android.bp new file mode 100644 index 0000000..93e059b --- /dev/null +++ b/harnesses/Android.bp @@ -0,0 +1,20 @@ +// +// Copyright (C) 2017 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. +// + +java_import_host { + name: "tradefed-cts-prebuilt", + jars: ["cts-tradefed/tradefed-cts-prebuilt.jar"], +} diff --git a/harnesses/Android.mk b/harnesses/Android.mk deleted file mode 100644 index 8992ecf..0000000 --- a/harnesses/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2017 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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_IS_HOST_MODULE := true -LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ - tradefed-cts-prebuilt:cts-tradefed/tradefed-cts-prebuilt.jar \ - -include $(BUILD_MULTI_PREBUILT) - diff --git a/tools/host_controller/Android.bp b/tools/host_controller/Android.bp new file mode 100644 index 0000000..174ac4a --- /dev/null +++ b/tools/host_controller/Android.bp @@ -0,0 +1,18 @@ +// Copyright (C) 2017 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. + +sh_binary_host { + name: "run", + src: "run", +} diff --git a/tools/host_controller/Android.mk b/tools/host_controller/Android.mk deleted file mode 100644 index f4ee939..0000000 --- a/tools/host_controller/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2017 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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional -LOCAL_PREBUILT_EXECUTABLES := run -include $(BUILD_HOST_PREBUILT) |