Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1214aeb7 authored by Ying Wang's avatar Ying Wang
Browse files

Add framework includes for any aidl source. 

Before this change, only aidl in apps gets the framework directories in
their include path.

Change-Id: Ieeaa162f577ea280fe71e4959cc73176b4dfd8ad
parent 02e172e8

core/base_rules.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

core/package.mk

+0 −7
Original line number Diff line number Diff line
@@ -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)))