StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass binder ABI to Soong"

Browse Source
This commit is contained in:
Treehugger Robot
2016-07-27 00:14:59 +00:00
committed by Gerrit Code Review
parent 620ce44a7a 369b7df35c
commit 4b4fdf0b2f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/soong.mk
View File

@@ -25,6 +25,13 @@ $(SOONG_BOOTSTRAP): bootstrap.bash $(SOONG_NEEDS_REBOOTSTRAP)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) BUILDDIR=$(SOONG_OUT_DIR) ./bootstrap.bash $(hide) BUILDDIR=$(SOONG_OUT_DIR) ./bootstrap.bash
BINDER32BIT :=
ifneq ($(TARGET_USES_64_BIT_BINDER),true)
ifneq ($(TARGET_IS_64_BIT),true)
BINDER32BIT := true
endif
endif
# Create soong.variables with copies of makefile settings. Runs every build, # Create soong.variables with copies of makefile settings. Runs every build,
# but only updates soong.variables if it changes # but only updates soong.variables if it changes
SOONG_VARIABLES_TMP := $(SOONG_VARIABLES).$$$$ SOONG_VARIABLES_TMP := $(SOONG_VARIABLES).$$$$
@@ -44,6 +51,7 @@ $(SOONG_VARIABLES): FORCE
echo ' "HostStaticBinaries": $(if $(strip $(BUILD_HOST_static)),true,false),'; \ echo ' "HostStaticBinaries": $(if $(strip $(BUILD_HOST_static)),true,false),'; \
echo ' "Cpusets": $(if $(strip $(ENABLE_CPUSETS)),true,false),'; \ echo ' "Cpusets": $(if $(strip $(ENABLE_CPUSETS)),true,false),'; \
echo ' "Schedboost": $(if $(strip $(ENABLE_SCHEDBOOST)),true,false),'; \ echo ' "Schedboost": $(if $(strip $(ENABLE_SCHEDBOOST)),true,false),'; \
echo ' "Binder32bit": $(if $(BINDER32BIT),true,false),'; \
echo ''; \ echo ''; \
echo ' "DeviceName": "$(TARGET_DEVICE)",'; \ echo ' "DeviceName": "$(TARGET_DEVICE)",'; \
echo ' "DeviceArch": "$(TARGET_ARCH)",'; \ echo ' "DeviceArch": "$(TARGET_ARCH)",'; \