tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp

Browse source 
Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8
This commit is contained in:
Xavier Ducrohet 2014-05-08 18:41:34 -07:00
commit a6a2969e02
2 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/Makefile
View file

@ -1491,26 +1491,10 @@ endif
atree_dir := development/build
# sdk/build/tools.atree contains the generic rules, while
#
# sdk/build/tools.$(TARGET_ARCH).atree contains target-specific rules
# the latter is optional.
#
sdk_tools_atree_files := sdk/build/tools.atree
ifneq (,$(strip $(wildcard sdk/build/tools.$(TARGET_ARCH).atree)))
sdk_tools_atree_files += sdk/build/tools.$(TARGET_ARCH).atree
endif
ifneq (,$(strip $(wildcard sdk/build/tools.$(HOST_OS).atree)))
sdk_tools_atree_files += sdk/build/tools.$(HOST_OS).atree
endif
ifneq (,$(strip $(wildcard sdk/build/tools.$(HOST_OS)-$(HOST_ARCH).atree)))
sdk_tools_atree_files += sdk/build/tools.$(HOST_OS)-$(HOST_ARCH).atree
endif
sdk_atree_files := \
$(atree_dir)/sdk.exclude.atree \
$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \
$(sdk_tools_atree_files)
$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree
# development/build/sdk-android-<abi>.atree is used to differentiate
# between architecture models (e.g. ARMv5TE versus ARMv7) when copying
@ -1538,7 +1522,6 @@ deps := \
$(INSTALLED_BUILD_PROP_TARGET) \
$(ATREE_FILES) \
$(sdk_atree_files) \
$(sdk_tools_atree_files) \
$(HOST_OUT_EXECUTABLES)/atree \
$(HOST_OUT_EXECUTABLES)/line_endings
@ -1581,7 +1564,6 @@ $(INTERNAL_SDK_TARGET): $(deps)
-o $(PRIVATE_DIR) && \
cp -f $(target_notice_file_txt) \
$(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \
cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/tools/NOTICE.txt && \
cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/platform-tools/NOTICE.txt && \
HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \
development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \

16
target/product/emulator.mk
View file

@ -20,21 +20,7 @@
# Host modules
PRODUCT_PACKAGES += \
emulator \
emulator-x86 \
emulator-arm \
emulator-mips \
emulator64-x86 \
emulator64-arm \
emulator64-mips \
libOpenglRender \
libGLES_CM_translator \
libGLES_V2_translator \
libEGL_translator \
lib64OpenglRender \
lib64GLES_CM_translator \
lib64GLES_V2_translator \
lib64EGL_translator
# Device modules
PRODUCT_PACKAGES += \