Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a52cce2c authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Fix duplicate eventlogtags warnings" into nyc-dev

parents 26288783 4cc2a58e

packages/SystemUI/Android.mk

+18 −5
Original line number Diff line number Diff line 
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

packages/SystemUI/tests/Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/tests/src/com/android/systemui/EventLogTags.logtags

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../../../../src/com/android/systemui/EventLogTags.logtags
 
 No newline at end of file