diff options
| author | Luis Vidal <lvidal@cyngn.com> | 2016-07-13 15:16:08 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-07-15 13:14:27 -0700 |
| commit | 06e04529841134d3cfe2287553bf73b0ebca9f17 (patch) | |
| tree | 74b8abd0ec4b226275a506fb40668a43aa05084d | |
| parent | d6a079f7e317358e4527fc27948d5b2f6621a22b (diff) | |
| download | build-06e04529841134d3cfe2287553bf73b0ebca9f17.zip build-06e04529841134d3cfe2287553bf73b0ebca9f17.tar.gz build-06e04529841134d3cfe2287553bf73b0ebca9f17.tar.bz2 | |
Add LOCAL_AIDL_FLAGS
Allow modules to define custom AIDL flags
Change-Id: I5609e6eb0a10d441cea2556179c8496293116dcf
| -rw-r--r-- | core/base_rules.mk | 2 | ||||
| -rw-r--r-- | core/clear_vars.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 202398a..8ed6dcf 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -219,7 +219,7 @@ else # build against the platform. LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) endif # LOCAL_SDK_VERSION -$(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_import)) -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src $(addprefix -I,$(LOCAL_AIDL_INCLUDES)) +$(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_import)) -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src $(addprefix -I,$(LOCAL_AIDL_INCLUDES)) $(LOCAL_AIDL_FLAGS) $(aidl_java_sources): $(intermediates.COMMON)/src/%.java: \ $(TOPDIR)$(LOCAL_PATH)/%.aidl \ diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 5c53c9f..1a3ce19 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -103,6 +103,7 @@ LOCAL_APK_LIBRARIES:= LOCAL_RES_LIBRARIES:= LOCAL_MANIFEST_INSTRUMENTATION_FOR:= LOCAL_AIDL_INCLUDES:= +LOCAL_AIDL_FLAGS:= LOCAL_JARJAR_RULES:= LOCAL_ADDITIONAL_JAVA_DIR:= LOCAL_ALLOW_UNDEFINED_SYMBOLS:= |