diff options
| author | 2016-02-25 09:28:13 -0800 | |
|---|---|---|
| committer | 2016-02-25 09:28:13 -0800 | |
| commit | 4cc2a58ed2b3e53f6fe8c182f239d08df1caac38 (patch) | |
| tree | 53f63ce28e644a43f33c4918ffcb6f81e1c031a9 | |
| parent | 596e1d3b7a7080b44a293095d81a61175ac60c49 (diff) | |
Fix duplicate eventlogtags warnings
Moves the protos and event log tags into a library,
so the build system doesn't think they're duplicates.
Bug: 27151225
Change-Id: Ic96b6b811d4813a4c48940081ea77b12fb23f0bc
| -rw-r--r-- | packages/SystemUI/Android.mk | 23 | ||||
| -rw-r--r-- | packages/SystemUI/tests/Android.mk | 7 | ||||
| l--------- | packages/SystemUI/tests/src/com/android/systemui/EventLogTags.logtags | 1 |
3 files changed, 21 insertions, 10 deletions
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index 88313bb50378..ad3c26b29c59 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk @@ -1,11 +1,25 @@ LOCAL_PATH:= $(call my-dir) + include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := SystemUI-proto-tags -LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-proto-files-under,src) $(call all-Iaidl-files-under, src) \ +LOCAL_SRC_FILES := $(call all-proto-files-under,src) \ src/com/android/systemui/EventLogTags.logtags +LOCAL_PROTOC_OPTIMIZE_TYPE := nano +LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors + +include $(BUILD_STATIC_JAVA_LIBRARY) + +# ------------------ + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-under, src) + LOCAL_STATIC_JAVA_LIBRARIES := \ Keyguard \ android-support-v7-recyclerview \ @@ -13,13 +27,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v7-appcompat \ android-support-v14-preference \ android-support-v17-leanback \ - framework-protos + framework-protos \ + SystemUI-proto-tags LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_PACKAGE_NAME := SystemUI -LOCAL_PROTOC_OPTIMIZE_TYPE := nano -LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index 964688b509c8..c9c58050f367 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -29,9 +29,7 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay \ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-Iaidl-files-under, src) \ - $(call all-java-files-under, ../src) \ - $(call all-proto-files-under, ../src) \ - src/com/android/systemui/EventLogTags.logtags + $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ frameworks/support/v7/preference/res \ @@ -53,7 +51,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v7-preference \ android-support-v7-appcompat \ android-support-v14-preference \ - android-support-v17-leanback + android-support-v17-leanback \ + SystemUI-proto-tags # sign this with platform cert, so this test is allowed to inject key events into # UI it doesn't own. This is necessary to allow screenshots to be taken diff --git a/packages/SystemUI/tests/src/com/android/systemui/EventLogTags.logtags b/packages/SystemUI/tests/src/com/android/systemui/EventLogTags.logtags deleted file mode 120000 index 2f243d70449d..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/EventLogTags.logtags +++ /dev/null @@ -1 +0,0 @@ -../../../../../src/com/android/systemui/EventLogTags.logtags
\ No newline at end of file |