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

Commit afe444a5 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Gerrit Code Review
Browse files

Merge "Remove SDK Tools from platform builds."

parents 0d4b3df6 51e303a2

core/Makefile

+1 −19
Original line number Diff line number Diff line
@@ -1491,27 +1491,11 @@ 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.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
@@ -1533,7 +1517,6 @@ deps := \ 
	$(INSTALLED_BUILD_PROP_TARGET) \

	$(ATREE_FILES) \

	$(atree_dir)/sdk.atree \

	$(sdk_tools_atree_files) \

	$(HOST_OUT_EXECUTABLES)/atree \

	$(HOST_OUT_EXECUTABLES)/line_endings
@@ -1576,7 +1559,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) && \

target/product/emulator.mk

+1 −15
Original line number Diff line number Diff line
@@ -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 += \