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

am b3cd0a56: am 39c7d243: Merge "Use goma when USE_GOMA=true is set"

Browse source 
* commit 'b3cd0a566391726a69d9f0e439268f4caf5df7db':
  Use goma when USE_GOMA=true is set
This commit is contained in:
Shinichiro Hamaji 2015-08-21 03:36:07 +00:00 committed by Android Git Automerger
commit 132f6dea3e
3 changed files with 60 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/config.mk
View file

@ -282,6 +282,7 @@ include $(BUILD_SYSTEM)/combo/select.mk
endif
include $(BUILD_SYSTEM)/ccache.mk
include $(BUILD_SYSTEM)/goma.mk
ifdef TARGET_PREFER_32_BIT
TARGET_PREFER_32_BIT_APPS := true

58
core/goma.mk Normal file
View file

@ -0,0 +1,58 @@
#
# Copyright (C) 2015 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Notice: this works only with Google's Goma build infrastructure.
ifneq ($(USE_GOMA),)
# Check if USE_NINJA is defined because GNU make won't work well
# with goma. Note this file is evaluated twice, once with
# USE_NINJA=true by GNU make and once with USE_NINJA=false by kati
# which is invoked by GNU make. So, we cannot test the value of
# USE_NINJA.
ifndef USE_NINJA
$(error USE_GOMA=true works only with USE_NINJA=true)
endif
ifdef GOMA_DIR
goma_dir := $(GOMA_DIR)
else
goma_dir := $(HOME)/goma
endif
goma_ctl := $(goma_dir)/goma_ctl.py
goma_cc := $(goma_dir)/gomacc
$(if $(wildcard $(goma_ctl)),, \
$(warning You should have goma in $$GOMA_DIR or $(HOME)/goma) \
$(error See go/ma/how-to-use-goma/how-to-use-goma-for-android for detail))
# Append gomacc to existing *_WRAPPER variables so it's possible to
# use both ccache and gomacc.
CC_WRAPPER := $(strip $(CC_WRAPPER) $(goma_cc))
CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(goma_cc))
# Ninja file generated by kati uses this for remote jobs (i.e.,
# commands which contain gomacc). Note the parallelism of all other
# jobs will be limited the number of cores.
KATI_REMOTE_NUM_JOBS_FLAG := --remote_num_jobs=500
# gomacc can start goma client's daemon process automatically, but
# it is safer and faster to start up it beforehand. We run this as a
# background process so this won't slow down the build.
$(shell $(goma_ctl) ensure_start &> /dev/null &)
goma_cc :=
goma_ctl :=
goma_dir :=
endif

2
core/ninja.mk
View file

@ -38,7 +38,7 @@ $(KATI_OUTPUTS): kati.intermediate $(KATI_FORCE)
kati.intermediate: $(KATI)
@echo Running kati to generate build.ninja...
@#TODO: use separate ninja file for mm or single target build
$(hide) $(KATI) --ninja --ninja_dir=$(PRODUCT_OUT) --regen --ignore_dirty=$(OUT_DIR)/% --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo --use_find_emulator -f build/core/main.mk $(ANDROID_TARGETS) USE_NINJA=false
$(hide) $(KATI) --ninja --ninja_dir=$(PRODUCT_OUT) --regen --ignore_dirty=$(OUT_DIR)/% --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo --use_find_emulator $(KATI_REMOTE_NUM_JOBS_FLAG) -f build/core/main.mk $(ANDROID_TARGETS) USE_NINJA=false
KATI_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CPPFLAGS)
KATI_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS)