Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" into nyc-dev
diff --git a/core/java.mk b/core/java.mk
index 64140fb..760d1e1 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -456,7 +456,7 @@
endif
ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
-$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/coverage.em
+$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/coverage.emma.ignore
$(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir)
# module level coverage filter can be defined using LOCAL_EMMA_COVERAGE_FILTER
# in Android.mk
diff --git a/core/main.mk b/core/main.mk
index f3d250c..cc1171a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -116,11 +116,6 @@
$(shell rm -f $(OUT_DIR)/ninja_build)
endif
-# With these files findleaves.py won't be unnecessarily slower even if
-# there is a user creates a copy of $(OUT_DIR).
-$(shell echo '# This file prevents findleaves.py from traversing this directory further' > $(OUT_DIR)/Android.mk)
-$(shell echo '# This file prevents findleaves.py from traversing this directory further' > $(OUT_DIR)/CleanSpec.mk)
-
# Write the build number to a file so it can be read back in
# without changing the command line every time. Avoids rebuilds
# when using ninja.
diff --git a/core/ninja.mk b/core/ninja.mk
index 8a4fd6d..5bb09ae 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -147,11 +147,18 @@
@echo Starting build with ninja
+$(hide) export NINJA_STATUS="$(NINJA_STATUS)" && source $(KATI_ENV_SH) && $(NINJA_MAKEPARALLEL) $(NINJA) $(NINJA_GOALS) -C $(TOP) -f $(COMBINED_BUILD_NINJA) $(NINJA_ARGS)
+# Dummy Android.mk and CleanSpec.mk files so that kati won't recurse into the
+# out directory
+DUMMY_OUT_MKS := $(OUT_DIR)/Android.mk $(OUT_DIR)/CleanSpec.mk
+$(DUMMY_OUT_MKS):
+ @mkdir -p $(dir $@)
+ $(hide) echo '# This file prevents findleaves.py from traversing this directory further' >$@
+
KATI_FIND_EMULATOR := --use_find_emulator
ifeq ($(KATI_EMULATE_FIND),false)
KATI_FIND_EMULATOR :=
endif
-$(KATI_BUILD_NINJA): $(KATI) $(MAKEPARALLEL) $(SOONG_ANDROID_MK) FORCE
+$(KATI_BUILD_NINJA): $(KATI) $(MAKEPARALLEL) $(DUMMY_OUT_MKS) $(SOONG_ANDROID_MK) 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)/% --no_ignore_dirty=$(SOONG_ANDROID_MK) --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo $(KATI_FIND_EMULATOR) -f build/core/main.mk $(KATI_GOALS) --gen_all_targets BUILDING_WITH_NINJA=true SOONG_ANDROID_MK=$(SOONG_ANDROID_MK)
diff --git a/core/soong.mk b/core/soong.mk
index 578aac9..2463953 100644
--- a/core/soong.mk
+++ b/core/soong.mk
@@ -1,23 +1,33 @@
SOONG_OUT_DIR := $(OUT_DIR)/soong
-SOONG := $(SOONG_OUT_DIR)/soong
-SOONG_BUILD_NINJA := $(SOONG_OUT_DIR)/build.ninja
-SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android.mk
-SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.variables
-SOONG_IN_MAKE := $(SOONG_OUT_DIR)/.soong.in_make
SOONG_HOST_EXECUTABLES := $(SOONG_OUT_DIR)/host/$(HOST_PREBUILT_TAG)/bin
KATI := $(SOONG_HOST_EXECUTABLES)/ckati
MAKEPARALLEL := $(SOONG_HOST_EXECUTABLES)/makeparallel
-ifeq (,$(filter /%,$(SOONG_OUT_DIR)))
-SOONG_TOP_RELPATH := $(shell python -c "import os; print os.path.relpath('$(TOP)', '$(SOONG_OUT_DIR)')")
-else
-SOONG_TOP_RELPATH := $(realpath $(TOP))
+SOONG := $(SOONG_OUT_DIR)/soong
+SOONG_BOOTSTRAP := $(SOONG_OUT_DIR)/.soong.bootstrap
+SOONG_BUILD_NINJA := $(SOONG_OUT_DIR)/build.ninja
+SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android.mk
+SOONG_IN_MAKE := $(SOONG_OUT_DIR)/.soong.in_make
+SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.variables
+
+# We need to rebootstrap soong if SOONG_OUT_DIR or the reverse path from
+# SOONG_OUT_DIR to TOP changes
+SOONG_NEEDS_REBOOTSTRAP :=
+ifneq ($(wildcard $(SOONG_BOOTSTRAP)),)
+ ifneq ($(SOONG_OUT_DIR),$(strip $(shell source $(SOONG_BOOTSTRAP); echo $$BUILDDIR)))
+ SOONG_NEEDS_REBOOTSTRAP := FORCE
+ $(warning soong_out_dir changed)
+ endif
+ ifneq ($(strip $(shell build/soong/reverse_path.py $(SOONG_OUT_DIR))),$(strip $(shell source $(SOONG_BOOTSTRAP); echo $$SRCDIR_FROM_BUILDDIR)))
+ SOONG_NEEDS_REBOOTSTRAP := FORCE
+ $(warning reverse path changed)
+ endif
endif
-# Bootstrap soong. Run only the first time for clean builds
-$(SOONG):
+# Bootstrap soong.
+$(SOONG_BOOTSTRAP): bootstrap.bash $(SOONG_NEEDS_REBOOTSTRAP)
$(hide) mkdir -p $(dir $@)
- $(hide) cd $(dir $@) && $(SOONG_TOP_RELPATH)/bootstrap.bash
+ $(hide) BUILDDIR=$(SOONG_OUT_DIR) ./bootstrap.bash
# Create soong.variables with copies of makefile settings. Runs every build,
# but only updates soong.variables if it changes
@@ -63,7 +73,7 @@
$(hide) touch $@
# Build an Android.mk listing all soong outputs as prebuilts
-$(SOONG_ANDROID_MK): $(SOONG) $(SOONG_VARIABLES) $(SOONG_IN_MAKE) FORCE
+$(SOONG_ANDROID_MK): $(SOONG_BOOTSTRAP) $(SOONG_VARIABLES) $(SOONG_IN_MAKE) FORCE
$(hide) $(SOONG) $(KATI) $(MAKEPARALLEL) $(NINJA_ARGS)
$(KATI): $(SOONG_ANDROID_MK)
diff --git a/target/product/core.mk b/target/product/core.mk
index b9fcdc8..75cf649 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -48,6 +48,7 @@
PacProcessor \
libpac \
PrintSpooler \
+ PrintRecommendationService \
ProxyHandler \
QuickSearchBox \
Settings \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 6fdc5c3..13f23ad 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -118,9 +118,17 @@
system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt
# Different dexopt types for different package update/install times.
+# On eng builds, make "boot" reasons do pure JIT for faster turnaround.
+ifeq (eng,$(TARGET_BUILD_VARIANT))
+ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+ pm.dexopt.first-boot=verify-at-runtime \
+ pm.dexopt.boot=verify-at-runtime
+else
+ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+ pm.dexopt.first-boot=interpret-only \
+ pm.dexopt.boot=verify-profile
+endif
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
- pm.dexopt.first-boot=interpret-only \
- pm.dexopt.boot=verify-profile \
pm.dexopt.install=interpret-only \
pm.dexopt.bg-dexopt=speed-profile \
pm.dexopt.ab-ota=speed-profile \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 76281f9..9c94574 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -108,9 +108,17 @@
ro.carrier=unknown
# Different dexopt types for different package update/install times.
+# On eng builds, make "boot" reasons do pure JIT for faster turnaround.
+ifeq (eng,$(TARGET_BUILD_VARIANT))
+ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+ pm.dexopt.first-boot=verify-at-runtime \
+ pm.dexopt.boot=verify-at-runtime
+else
+ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+ pm.dexopt.first-boot=interpret-only \
+ pm.dexopt.boot=verify-profile
+endif
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
- pm.dexopt.first-boot=interpret-only \
- pm.dexopt.boot=verify-profile \
pm.dexopt.install=interpret-only \
pm.dexopt.bg-dexopt=speed-profile \
pm.dexopt.ab-ota=speed-profile \