diff options
| author | The Android Automerger <android-build@android.com> | 2010-06-11 11:47:08 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2010-06-11 11:47:08 -0700 |
| commit | 41cdb0732ddb599e9b81810a412f85a440116d51 (patch) | |
| tree | 77ccb6a91cfe71a023809fa9dfa1ef905e969239 | |
| parent | 61101d29565d5b3e79d1c43a39436eb45b64f757 (diff) | |
| parent | a07d37b79300e76da5f21f532578fcd686a74b16 (diff) | |
| download | build-41cdb0732ddb599e9b81810a412f85a440116d51.tar.gz | |
Merge branch 'froyo' into froyo-release
| -rw-r--r-- | core/base_rules.mk | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 77135ae15e..3f343e2254 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -189,13 +189,15 @@ aidl_sources := $(addprefix $(TOP_DIR)$(LOCAL_PATH)/, $(aidl_sources)) aidl_preprocess_import := LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION)) ifdef LOCAL_SDK_VERSION -ifneq ($(LOCAL_SDK_VERSION),current) -aidl_preprocess_import := -p$(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/framework.aidl +ifeq ($(LOCAL_SDK_VERSION),current) + aidl_preprocess_import := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl +else + aidl_preprocess_import := $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/framework.aidl endif # !current endif # LOCAL_SDK_VERSION -$(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(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)) -$(aidl_java_sources): $(intermediates.COMMON)/src/%.java: $(TOPDIR)$(LOCAL_PATH)/%.aidl $(PRIVATE_ADDITIONAL_DEPENDENCIES) $(AIDL) +$(aidl_java_sources): $(intermediates.COMMON)/src/%.java: $(TOPDIR)$(LOCAL_PATH)/%.aidl $(PRIVATE_ADDITIONAL_DEPENDENCIES) $(AIDL) $(aidl_preprocess_import) $(transform-aidl-to-java) -include $(aidl_java_sources:%.java=%.P) @@ -320,8 +322,14 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_OBJECTS := $(patsubst %.java,%.class ifeq ($(my_prefix),TARGET_) ifeq ($(LOCAL_SDK_VERSION),) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core) -endif -endif +else +ifeq ($(LOCAL_SDK_VERSION),current) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,android_stubs_current) +else +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,sdk_v$(LOCAL_SDK_VERSION)) +endif # current +endif # LOCAL_SDK_VERSION +endif # TARGET_ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR) |