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

Commit 5a5befb7 authored by Colin Cross's avatar Colin Cross
Browse files

Enable goma in soong 

Pass the USE_GOMA flag to soong, and export the CC_WRAPPER environment
variable after adding gomacc to it.

Bug: 31142427
Change-Id: I6de698a40817c0615b03fa17bd27075465d79ffd
parent 2e5dc07c

core/config.mk

+3 −0
Original line number Original line Diff line number Diff line
@@ -284,6 +284,9 @@ endif 
include $(BUILD_SYSTEM)/ccache.mk

include $(BUILD_SYSTEM)/ccache.mk

include $(BUILD_SYSTEM)/goma.mk

include $(BUILD_SYSTEM)/goma.mk





export CC_WRAPPER

export CXX_WRAPPER



ifdef TARGET_PREFER_32_BIT

ifdef TARGET_PREFER_32_BIT

TARGET_PREFER_32_BIT_APPS := true

TARGET_PREFER_32_BIT_APPS := true

TARGET_PREFER_32_BIT_EXECUTABLES := true

TARGET_PREFER_32_BIT_EXECUTABLES := true

core/ninja.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -131,8 +131,8 @@ COMBINED_BUILD_NINJA := $(OUT_DIR)/combined$(KATI_NINJA_SUFFIX).ninja 




$(COMBINED_BUILD_NINJA): $(KATI_BUILD_NINJA)

$(COMBINED_BUILD_NINJA): $(KATI_BUILD_NINJA)

	$(hide) echo "builddir = $(OUT_DIR)" > $(COMBINED_BUILD_NINJA)

	$(hide) echo "builddir = $(OUT_DIR)" > $(COMBINED_BUILD_NINJA)

	$(hide) echo "subninja $(SOONG_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)

	$(hide) echo "include $(KATI_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)

	$(hide) echo "subninja $(KATI_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)

	$(hide) echo "include $(SOONG_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)





$(sort $(DEFAULT_GOAL) $(ANDROID_GOALS)) : ninja_wrapper

$(sort $(DEFAULT_GOAL) $(ANDROID_GOALS)) : ninja_wrapper

	@#empty

	@#empty

core/soong.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ $(SOONG_VARIABLES): FORCE 
	echo '    "Binder32bit": $(if $(BINDER32BIT),true,false),'; \

	echo '    "Binder32bit": $(if $(BINDER32BIT),true,false),'; \

	echo '    "DevicePrefer32BitExecutables": $(if $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES)),true,false),'; \

	echo '    "DevicePrefer32BitExecutables": $(if $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES)),true,false),'; \

	echo '    "HostPrefer32BitExecutables": $(if $(filter true,$(HOST_PREFER_32_BIT)),true,false),'; \

	echo '    "HostPrefer32BitExecutables": $(if $(filter true,$(HOST_PREFER_32_BIT)),true,false),'; \

	echo '    "UseGoma": $(if $(filter-out false,$(USE_GOMA)),true,false),'; \

	echo ''; \

	echo ''; \

	echo '    "DeviceName": "$(TARGET_DEVICE)",'; \

	echo '    "DeviceName": "$(TARGET_DEVICE)",'; \

	echo '    "DeviceArch": "$(TARGET_ARCH)",'; \

	echo '    "DeviceArch": "$(TARGET_ARCH)",'; \