diff options
| author | Ying Wang <wangying@google.com> | 2010-12-15 13:18:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-15 13:18:23 -0800 |
| commit | fe7ffc9134f0ab9b9ca81436e8532dec64ebb456 (patch) | |
| tree | 1d55b7560f199717e687edd888db06b09c7d6982 | |
| parent | b5c02ecbde6c00bcbc65917353ec976430d9ffca (diff) | |
| parent | 1214aeb75f9b506ebaa5856f2cea6bd8967ede51 (diff) | |
| download | build-fe7ffc9134f0ab9b9ca81436e8532dec64ebb456.zip build-fe7ffc9134f0ab9b9ca81436e8532dec64ebb456.tar.gz build-fe7ffc9134f0ab9b9ca81436e8532dec64ebb456.tar.bz2 | |
Merge "Add framework includes for any aidl source."
| -rw-r--r-- | core/base_rules.mk | 3 | ||||
| -rw-r--r-- | core/package.mk | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index d00f2a3..d0af289 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -220,6 +220,9 @@ ifneq ($(strip $(aidl_sources)),) aidl_java_sources := $(patsubst %.aidl,%.java,$(addprefix $(intermediates.COMMON)/src/, $(aidl_sources))) aidl_sources := $(addprefix $(TOP_DIR)$(LOCAL_PATH)/, $(aidl_sources)) +ifeq (,$(TARGET_BUILD_APPS)) +LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) +endif aidl_preprocess_import := LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION)) ifdef LOCAL_SDK_VERSION diff --git a/core/package.mk b/core/package.mk index 0584b20..f8be8a7 100644 --- a/core/package.mk +++ b/core/package.mk @@ -76,8 +76,6 @@ ifeq ($(LOCAL_MODULE_TAGS),) LOCAL_MODULE_TAGS := optional endif -#$(warning $(LOCAL_PATH) $(LOCAL_PACKAGE_NAME) $(sort $(LOCAL_MODULE_TAGS))) - ifeq ($(filter tests, $(LOCAL_MODULE_TAGS)),) # Force localization check if it's not tagged as tests. LOCAL_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) -z @@ -97,11 +95,6 @@ LOCAL_RESOURCE_DIR := \ $(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))) \ $(LOCAL_RESOURCE_DIR) -# this is an app, so add the system libraries to the search path -LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) - -#$(warning Finding assets for $(LOCAL_ASSET_DIR)) - all_assets := $(call find-subdir-assets,$(LOCAL_ASSET_DIR)) all_assets := $(addprefix $(LOCAL_ASSET_DIR)/,$(patsubst assets/%,%,$(all_assets))) |