Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

build: 提交

build


Commit MetaInfo

修订版ee9250bf9723ae63a4b04e5923175042e8f3cab4 (tree)
时间2016-10-18 00:25:35
作者Jaap Jan Meijer <jjmeijer88@gmai...>
CommiterJaap Jan Meijer

Log Message

Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

更改概述

差异

--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -106,6 +106,7 @@ LOCAL_RES_LIBRARIES:=
106106 LOCAL_MANIFEST_INSTRUMENTATION_FOR:=
107107 LOCAL_AIDL_INCLUDES:=
108108 LOCAL_VTS_INCLUDES:=
109+LOCAL_AIDL_FLAGS:=
109110 LOCAL_JARJAR_RULES:=
110111 LOCAL_ADDITIONAL_JAVA_DIR:=
111112 LOCAL_ALLOW_UNDEFINED_SYMBOLS:=
--- a/core/java.mk
+++ b/core/java.mk
@@ -323,7 +323,7 @@ else
323323 # build against the platform.
324324 LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
325325 endif # LOCAL_SDK_VERSION
326-$(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_import)) -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src $(addprefix -I,$(LOCAL_AIDL_INCLUDES))
326+$(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)
327327
328328 $(aidl_java_sources): $(intermediates.COMMON)/src/%.java: \
329329 $(LOCAL_PATH)/%.aidl \
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -96,7 +96,7 @@ KATI_NINJA_SUFFIX := $(KATI_NINJA_SUFFIX)-mmma-$(call replace_space_and_slash,$(
9696 endif
9797
9898 my_checksum_suffix :=
99-my_ninja_suffix_too_long := $(filter 1, $(shell v='$(KATI_NINJA_SUFFIX)' && echo $$(($${$(pound)v} > 64))))
99+my_ninja_suffix_too_long := $(filter 1, $(shell v='$(KATI_NINJA_SUFFIX)' && echo $$(($${$(pound)v} > 240))))
100100 ifneq ($(my_ninja_suffix_too_long),)
101101 # Replace the suffix with a checksum if it gets too long.
102102 my_checksum_suffix := $(KATI_NINJA_SUFFIX)
Show on old repository browser