summaryrefslogtreecommitdiff
path: root/tests/libs-permissions
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-02-12 09:38:16 -0800
committerSasha Smundak <asmundak@google.com>2019-02-19 13:46:51 -0800
commit500db62bfa834b191bc353596528127f69da4c39 (patch)
treed12bb1aaa116599aacfaefbf998868c7c63f5e75 /tests/libs-permissions
parent5fe2936fcb67bd559fbdefa40b782c2c6eb7ebc7 (diff)
Convert Android.mk file to Android.bp
See build/soong/README.md for more information. Bug: 122332340 Test: treehugger Change-Id: I23d8d5a019155a0f3296f7ab75e9b44b7621f3c8
Diffstat (limited to 'tests/libs-permissions')
-rw-r--r--tests/libs-permissions/Android.bp29
-rw-r--r--tests/libs-permissions/Android.mk29
2 files changed, 29 insertions, 29 deletions
diff --git a/tests/libs-permissions/Android.bp b/tests/libs-permissions/Android.bp
new file mode 100644
index 000000000000..c7c4b10a8405
--- /dev/null
+++ b/tests/libs-permissions/Android.bp
@@ -0,0 +1,29 @@
+java_library {
+ name: "com.android.test.libs.product",
+ installable: true,
+ product_specific: true,
+ srcs: ["product/java/**/*.java"],
+ required: ["com.android.test.libs.product.xml"],
+}
+
+prebuilt_etc {
+ name: "com.android.test.libs.product.xml",
+ src: "product/com.android.test.libs.product.xml",
+ sub_dir: "permissions",
+ product_specific: true,
+}
+
+java_library {
+ name: "com.android.test.libs.product_services",
+ installable: true,
+ product_services_specific: true,
+ srcs: ["product_services/java/**/*.java"],
+ required: ["com.android.test.libs.product_services.xml"],
+}
+
+prebuilt_etc {
+ name: "com.android.test.libs.product_services.xml",
+ src: "product_services/com.android.test.libs.product_services.xml",
+ sub_dir: "permissions",
+ product_services_specific: true,
+}
diff --git a/tests/libs-permissions/Android.mk b/tests/libs-permissions/Android.mk
deleted file mode 100644
index f4250c8b4e97..000000000000
--- a/tests/libs-permissions/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.android.test.libs.product
-LOCAL_PRODUCT_MODULE := true
-LOCAL_SRC_FILES := $(call all-java-files-under, product/java)
-LOCAL_REQUIRED_MODULES := com.android.test.libs.product.xml
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.android.test.libs.product.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions
-LOCAL_SRC_FILES:= product/com.android.test.libs.product.xml
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.android.test.libs.product_services
-LOCAL_PRODUCT_SERVICES_MODULE := true
-LOCAL_SRC_FILES := $(call all-java-files-under, product_services/java)
-LOCAL_REQUIRED_MODULES := com.android.test.libs.product_services.xml
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.android.test.libs.product_services.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_SERVICES_ETC)/permissions
-LOCAL_SRC_FILES:= product_services/com.android.test.libs.product_services.xml
-include $(BUILD_PREBUILT)