openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Use product-specific Soong outputs" 

am: f100d01dd5

* commit 'f100d01dd5dde712a19bd75f8f6895b21641bd62':
  Use product-specific Soong outputs

Change-Id: I530778730be7424be3d3fbe88fd65fc70d2a0d12
This commit is contained in:
Dan Willemsen 2016-05-12 20:43:47 +00:00 committed by android-build-merger
parent 2c7da1d5c7 f100d01dd5
commit f8c5eac739
1 changed files with 3 additions and 1 deletions

4
core/soong.mk
View File

@ -8,7 +8,7 @@ SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.variables
# Only include the Soong-generated Android.mk if we're merging the
# Soong-defined binaries with Kati-defined binaries.
ifeq ($(USE_SOONG),true)
SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android.mk
SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android-$(TARGET_PRODUCT).mk
endif
# We need to rebootstrap soong if SOONG_OUT_DIR or the reverse path from
@ -37,6 +37,8 @@ $(SOONG_VARIABLES): FORCE
$(hide) mkdir -p $(dir $@)
$(hide) (\
echo '{'; \
echo ' "Make_suffix": "-$(TARGET_PRODUCT)",'; \
echo ''; \
echo ' "Platform_sdk_version": $(PLATFORM_SDK_VERSION),'; \
echo ' "Unbundled_build": $(if $(TARGET_BUILD_APPS),true,false),'; \
echo ' "Brillo": $(if $(BRILLO),true,false),'; \