diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-26 03:00:51 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-26 03:00:51 +0000 |
commit | 5742a145faf016f7d0db8c0a7c367c2a2e352d9c (patch) | |
tree | dbdfa1a5e871697ec4088b3d09987953b987a8d8 | |
parent | 94773d87b8951a91621f53fb09b00ca351be316c (diff) | |
parent | d197e5e045630cfbcfc9313c95fcbbde61fb2bfc (diff) | |
download | framework-android10-release.tar.gz |
Snap for 5406228 from d197e5e045630cfbcfc9313c95fcbbde61fb2bfc to qt-releaseandroid-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsi
Change-Id: I82aa4efd1c485ba0e2d3140ad7fdb04e6aaad1ca
-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) |