diff options
| author | 2017-10-26 01:42:45 +0000 | |
|---|---|---|
| committer | 2017-10-26 01:42:45 +0000 | |
| commit | 9de94c628b32c6de274e9d23be4f284b74b9f588 (patch) | |
| tree | 5d815b78d474a463fe2c73200843ffcc08bf94fb | |
| parent | 257046fab52acce3d5b26b46dabcfc945c2c8f57 (diff) | |
| parent | 5fec62ceb75cd2c476cb6c074f0c4a52e3024c45 (diff) | |
Merge "Convert framework-protos to Android.bp" am: d4609af986 am: d78b46eb63
am: 5fec62ceb7
Change-Id: Ice5e7dfcf2ac8d58cde7cc5691271e318a45582d
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | proto/Android.bp | 17 | ||||
| -rw-r--r-- | proto/Android.mk | 33 |
3 files changed, 18 insertions, 33 deletions
diff --git a/Android.bp b/Android.bp index 13f6b6e9bc02..c89cc400171d 100644 --- a/Android.bp +++ b/Android.bp @@ -75,6 +75,7 @@ subdirs = [ "core/*", "libs/*", "media/*", + "proto", "tools/*", "native/android", "native/graphics/jni", diff --git a/proto/Android.bp b/proto/Android.bp new file mode 100644 index 000000000000..95f453c3e523 --- /dev/null +++ b/proto/Android.bp @@ -0,0 +1,17 @@ +java_library_static { + name: "framework-protos", + host_supported: true, + proto: { + type: "nano", + }, + srcs: ["src/**/*.proto"], + no_framework_libs: true, + target: { + android: { + jarjar_rules: "jarjar-rules.txt", + }, + host: { + static_libs: ["libprotobuf-java-nano"], + }, + }, +} diff --git a/proto/Android.mk b/proto/Android.mk deleted file mode 100644 index 1c03d1616f9f..000000000000 --- a/proto/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := framework-protos - -LOCAL_PROTOC_OPTIMIZE_TYPE := nano -LOCAL_SRC_FILES:= $(call all-proto-files-under, src) -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart - -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/jarjar-rules.txt - -include $(BUILD_STATIC_JAVA_LIBRARY) - -# Host-side version of framework-protos -# ============================================================ -include $(CLEAR_VARS) - -LOCAL_MODULE := host-framework-protos -LOCAL_MODULE_TAGS := optional - -LOCAL_PROTOC_OPTIMIZE_TYPE := nano -LOCAL_SRC_FILES:= $(call all-proto-files-under, src) - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-nano - -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/jarjar-rules.txt - -include $(BUILD_HOST_JAVA_LIBRARY)
\ No newline at end of file |