diff options
| author | Gaurav Shah <gauravsh@google.com> | 2015-11-02 22:22:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-02 22:22:50 +0000 |
| commit | f589c7b442feb02843bdf82305b599b686fc5204 (patch) | |
| tree | c4c1f13ffe928656d211c62f5cfed521a29341e1 | |
| parent | aed6805380810f51bb0d8b93fc5eac005a6de364 (diff) | |
| parent | c13f9c952dafb5a59ce5ae039a599e83a9622b83 (diff) | |
| download | build-f589c7b442feb02843bdf82305b599b686fc5204.tar.gz | |
Merge "envsetup,product,ninja: enable symlink traversal"
| -rw-r--r-- | core/envsetup.mk | 4 | ||||
| -rw-r--r-- | core/ninja.mk | 6 | ||||
| -rw-r--r-- | core/product.mk | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 199c6b760c..050d4459ae 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -141,8 +141,8 @@ SDK_HOST_ARCH := x86 board_config_mk := \ $(strip $(sort $(wildcard \ $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \ - $(shell test -d device && find device -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \ - $(shell test -d vendor && find vendor -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \ + $(shell test -d device && find -L device -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \ + $(shell test -d vendor && find -L vendor -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \ ))) ifeq ($(board_config_mk),) $(error No config file found for TARGET_DEVICE $(TARGET_DEVICE)) diff --git a/core/ninja.mk b/core/ninja.mk index def5823ed4..7a3166a3df 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -120,9 +120,13 @@ ninja_wrapper: $(KATI_BUILD_NINJA) $(MAKEPARALLEL) @echo Starting build with ninja +$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) $(filter-out dist,$(ANDROID_TARGETS)) -C $(TOP) $(NINJA_ARGS) +KATI_FIND_EMULATOR := --use_find_emulator +ifeq ($(KATI_EMULATE_FIND),false) + KATI_FIND_EMULATOR := +endif $(KATI_BUILD_NINJA): $(KATI) $(MAKEPARALLEL) FORCE @echo Running kati to generate build$(KATI_NINJA_SUFFIX).ninja... - +$(hide) $(KATI_MAKEPARALLEL) $(KATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo --use_find_emulator -f build/core/main.mk $(KATI_TARGETS) --gen_all_targets BUILDING_WITH_NINJA=true + +$(hide) $(KATI_MAKEPARALLEL) $(KATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo $(KATI_FIND_EMULATOR) -f build/core/main.mk $(KATI_TARGETS) --gen_all_targets BUILDING_WITH_NINJA=true KATI_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAGS) KATI_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS) diff --git a/core/product.mk b/core/product.mk index 3b78337423..d6f2860e3a 100644 --- a/core/product.mk +++ b/core/product.mk @@ -28,9 +28,9 @@ # $(call ) isn't necessary. # define _find-android-products-files -$(sort $(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk)) \ - $(sort $(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk)) \ - $(sort $(shell test -d product && find product -maxdepth 6 -name AndroidProducts.mk)) \ +$(sort $(shell test -d device && find -L device -maxdepth 6 -name AndroidProducts.mk)) \ + $(sort $(shell test -d vendor && find -L vendor -maxdepth 6 -name AndroidProducts.mk)) \ + $(sort $(shell test -d product && find -L product -maxdepth 6 -name AndroidProducts.mk)) \ $(SRC_TARGET_DIR)/product/AndroidProducts.mk endef |