diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-07-19 01:24:07 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2017-07-20 11:47:11 -0700 |
| commit | 2385ebebee97b45adbddb9462dc4ad33fd4f7951 (patch) | |
| tree | a903b2abeb9da9dfd0db662a908cfd67afc99f9b /Android.mk | |
| parent | 6cd0e46a8ee384a5255b6189cd46ed694fcbecac (diff) | |
| download | android_packages_apps_Trebuchet-2385ebebee97b45adbddb9462dc4ad33fd4f7951.tar.gz android_packages_apps_Trebuchet-2385ebebee97b45adbddb9462dc4ad33fd4f7951.tar.bz2 android_packages_apps_Trebuchet-2385ebebee97b45adbddb9462dc4ad33fd4f7951.zip | |
Adding support for derivative apps to safely extend LauncherLog proto
Bug: 37676962
Change-Id: I24716070841b41418ac57b8dc367278e3ebdd046
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index c8a53d23d..0543b4244 100644 --- a/Android.mk +++ b/Android.mk @@ -33,7 +33,8 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ $(call all-java-files-under, src_config) \ $(call all-java-files-under, src_flags) \ - $(call all-proto-files-under, protos) + $(call all-proto-files-under, protos) \ + $(call all-proto-files-under, proto_overrides) LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ @@ -42,7 +43,7 @@ LOCAL_RESOURCE_DIR := \ LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PROTOC_OPTIMIZE_TYPE := nano -LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ +LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/ LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java LOCAL_AAPT_FLAGS := \ @@ -66,10 +67,10 @@ include $(BUILD_PACKAGE) # include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-proto-files-under, protos) +LOCAL_SRC_FILES := $(call all-proto-files-under, protos) $(call all-proto-files-under, proto_overrides) LOCAL_PROTOC_OPTIMIZE_TYPE := nano -LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ +LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/ LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java LOCAL_MODULE_TAGS := optional |