diff options
-rw-r--r-- | core/Makefile | 4 | ||||
-rw-r--r-- | core/binary.mk | 2 | ||||
-rw-r--r-- | core/definitions.mk | 2 | ||||
-rw-r--r-- | core/dex_preopt_odex_install.mk | 1 | ||||
-rw-r--r-- | core/goma.mk | 14 | ||||
-rw-r--r-- | core/main.mk | 2 | ||||
-rw-r--r-- | core/version_defaults.mk | 2 | ||||
-rw-r--r-- | target/board/generic/BoardConfig.mk | 5 | ||||
-rw-r--r-- | target/board/generic_arm64/BoardConfig.mk | 6 | ||||
-rw-r--r-- | target/product/base_system.mk | 1 | ||||
-rw-r--r-- | target/product/runtime_libart.mk | 1 | ||||
-rwxr-xr-x | tools/buildinfo.sh | 4 | ||||
-rwxr-xr-x | tools/releasetools/build_image.py | 1 |
13 files changed, 21 insertions, 24 deletions
diff --git a/core/Makefile b/core/Makefile index f6a246bcb..c63e2137e 100644 --- a/core/Makefile +++ b/core/Makefile | |||
@@ -317,7 +317,7 @@ $(intermediate_system_build_prop): PRIVATE_BUILD_DESC := $(build_desc) | |||
317 | # The string used to uniquely identify the combined build and product; used by the OTA server. | 317 | # The string used to uniquely identify the combined build and product; used by the OTA server. |
318 | ifeq (,$(strip $(BUILD_FINGERPRINT))) | 318 | ifeq (,$(strip $(BUILD_FINGERPRINT))) |
319 | ifeq ($(strip $(HAS_BUILD_NUMBER)),false) | 319 | ifeq ($(strip $(HAS_BUILD_NUMBER)),false) |
320 | BF_BUILD_NUMBER := $(USER)$$($(DATE_FROM_FILE) +%m%d%H%M) | 320 | BF_BUILD_NUMBER := $(BUILD_USERNAME)$$($(DATE_FROM_FILE) +%m%d%H%M) |
321 | else | 321 | else |
322 | BF_BUILD_NUMBER := $(file <$(BUILD_NUMBER_FILE)) | 322 | BF_BUILD_NUMBER := $(file <$(BUILD_NUMBER_FILE)) |
323 | endif | 323 | endif |
@@ -420,6 +420,8 @@ endif | |||
420 | BUILD_ID="$(BUILD_ID)" \ | 420 | BUILD_ID="$(BUILD_ID)" \ |
421 | BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ | 421 | BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ |
422 | DATE="$(DATE_FROM_FILE)" \ | 422 | DATE="$(DATE_FROM_FILE)" \ |
423 | BUILD_USERNAME="$(BUILD_USERNAME)" \ | ||
424 | BUILD_HOSTNAME="$(BUILD_HOSTNAME)" \ | ||
423 | BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \ | 425 | BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \ |
424 | BOARD_BUILD_SYSTEM_ROOT_IMAGE="$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)" \ | 426 | BOARD_BUILD_SYSTEM_ROOT_IMAGE="$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)" \ |
425 | AB_OTA_UPDATER="$(AB_OTA_UPDATER)" \ | 427 | AB_OTA_UPDATER="$(AB_OTA_UPDATER)" \ |
diff --git a/core/binary.mk b/core/binary.mk index c3878f96c..e7b0c52d6 100644 --- a/core/binary.mk +++ b/core/binary.mk | |||
@@ -913,8 +913,6 @@ vts_gen_include_root := $(intermediates)/vts-generated/include | |||
913 | # Thus we'll actually generate source for each architecture. | 913 | # Thus we'll actually generate source for each architecture. |
914 | $(foreach s,$(vts_src),\ | 914 | $(foreach s,$(vts_src),\ |
915 | $(eval $(call define-vts-cpp-rule,$(s),$(vts_gen_cpp_root),vts_gen_cpp))) | 915 | $(eval $(call define-vts-cpp-rule,$(s),$(vts_gen_cpp_root),vts_gen_cpp))) |
916 | $(foreach cpp,$(vts_gen_cpp), \ | ||
917 | $(call include-depfile,$(addsuffix .vts.P,$(basename $(cpp))),$(cpp))) | ||
918 | $(call track-src-file-gen,$(vts_src),$(vts_gen_cpp)) | 916 | $(call track-src-file-gen,$(vts_src),$(vts_gen_cpp)) |
919 | 917 | ||
920 | $(vts_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE) | 918 | $(vts_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE) |
diff --git a/core/definitions.mk b/core/definitions.mk index a67508018..a9807f110 100644 --- a/core/definitions.mk +++ b/core/definitions.mk | |||
@@ -1023,7 +1023,7 @@ define transform-vts-to-cpp | |||
1023 | @mkdir -p $(dir $@) | 1023 | @mkdir -p $(dir $@) |
1024 | @mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR) | 1024 | @mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR) |
1025 | @echo "Generating C++ from VTS: $(PRIVATE_MODULE) <= $<" | 1025 | @echo "Generating C++ from VTS: $(PRIVATE_MODULE) <= $<" |
1026 | $(hide) $(VTSC) -d$(basename $@).vts.P $(PRIVATE_VTS_FLAGS) \ | 1026 | $(hide) $(VTSC) -TODO_b/120496070 $(PRIVATE_VTS_FLAGS) \ |
1027 | $< $(PRIVATE_HEADER_OUTPUT_DIR) $@ | 1027 | $< $(PRIVATE_HEADER_OUTPUT_DIR) $@ |
1028 | endef | 1028 | endef |
1029 | 1029 | ||
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 17eeb8a11..69790cb10 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk | |||
@@ -202,6 +202,7 @@ ifdef LOCAL_DEX_PREOPT | |||
202 | $(call add_json_bool, ForceCreateAppImage, $(filter true,$(LOCAL_DEX_PREOPT_APP_IMAGE))) | 202 | $(call add_json_bool, ForceCreateAppImage, $(filter true,$(LOCAL_DEX_PREOPT_APP_IMAGE))) |
203 | $(call add_json_bool, PresignedPrebuilt, $(filter PRESIGNED,$(LOCAL_CERTIFICATE))) | 203 | $(call add_json_bool, PresignedPrebuilt, $(filter PRESIGNED,$(LOCAL_CERTIFICATE))) |
204 | 204 | ||
205 | $(call add_json_bool, NoStripping, $(filter nostripping,$(LOCAL_DEX_PREOPT))) | ||
205 | $(call add_json_str, StripInputPath, $$1) | 206 | $(call add_json_str, StripInputPath, $$1) |
206 | $(call add_json_str, StripOutputPath, $$2) | 207 | $(call add_json_str, StripOutputPath, $$2) |
207 | 208 | ||
diff --git a/core/goma.mk b/core/goma.mk index 3787dfd19..f5064e621 100644 --- a/core/goma.mk +++ b/core/goma.mk | |||
@@ -17,6 +17,7 @@ | |||
17 | # Notice: this works only with Google's Goma build infrastructure. | 17 | # Notice: this works only with Google's Goma build infrastructure. |
18 | ifneq ($(filter-out false,$(USE_GOMA)),) | 18 | ifneq ($(filter-out false,$(USE_GOMA)),) |
19 | # Goma requires a lot of processes and file descriptors. | 19 | # Goma requires a lot of processes and file descriptors. |
20 | # TODO(yyanagisawa): move these code to build/soong/uil/build/goma.go | ||
20 | ifeq ($(shell echo $$(($$(ulimit -u) < 2500 || $$(ulimit -n) < 16000))),1) | 21 | ifeq ($(shell echo $$(($$(ulimit -u) < 2500 || $$(ulimit -n) < 16000))),1) |
21 | $(warning Max user processes and/or open files are insufficient) | 22 | $(warning Max user processes and/or open files are insufficient) |
22 | ifeq ($(shell uname),Darwin) | 23 | ifeq ($(shell uname),Darwin) |
@@ -31,26 +32,13 @@ ifneq ($(filter-out false,$(USE_GOMA)),) | |||
31 | else | 32 | else |
32 | goma_dir := $(HOME)/goma | 33 | goma_dir := $(HOME)/goma |
33 | endif | 34 | endif |
34 | goma_ctl := $(goma_dir)/goma_ctl.py | ||
35 | GOMA_CC := $(goma_dir)/gomacc | 35 | GOMA_CC := $(goma_dir)/gomacc |
36 | 36 | ||
37 | $(if $(wildcard $(goma_ctl)),, \ | ||
38 | $(warning You should have goma in $$GOMA_DIR or $(HOME)/goma) \ | ||
39 | $(error See go/ma/how-to-use-goma/how-to-use-goma-for-android for detail)) | ||
40 | |||
41 | # Append gomacc to existing *_WRAPPER variables so it's possible to | 37 | # Append gomacc to existing *_WRAPPER variables so it's possible to |
42 | # use both ccache and gomacc. | 38 | # use both ccache and gomacc. |
43 | CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC)) | 39 | CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC)) |
44 | CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC)) | 40 | CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC)) |
45 | JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC)) | 41 | JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC)) |
46 | 42 | ||
47 | # gomacc can start goma client's daemon process automatically, but | ||
48 | # it is safer and faster to start up it beforehand. We run this as a | ||
49 | # background process so this won't slow down the build. | ||
50 | ifndef NOSTART_GOMA | ||
51 | $(shell ( $(goma_ctl) ensure_start ) &> /dev/null &) | ||
52 | endif | ||
53 | |||
54 | goma_ctl := | ||
55 | goma_dir := | 43 | goma_dir := |
56 | endif | 44 | endif |
diff --git a/core/main.mk b/core/main.mk index 9fd1c35c5..4f81c2163 100644 --- a/core/main.mk +++ b/core/main.mk | |||
@@ -80,7 +80,7 @@ endif | |||
80 | ifeq ($(strip $(HAS_BUILD_NUMBER)),false) | 80 | ifeq ($(strip $(HAS_BUILD_NUMBER)),false) |
81 | # BUILD_NUMBER has a timestamp in it, which means that | 81 | # BUILD_NUMBER has a timestamp in it, which means that |
82 | # it will change every time. Pick a stable value. | 82 | # it will change every time. Pick a stable value. |
83 | FILE_NAME_TAG := eng.$(USER) | 83 | FILE_NAME_TAG := eng.$(BUILD_USERNAME) |
84 | else | 84 | else |
85 | FILE_NAME_TAG := $(file <$(BUILD_NUMBER_FILE)) | 85 | FILE_NAME_TAG := $(file <$(BUILD_NUMBER_FILE)) |
86 | endif | 86 | endif |
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 0fd40db12..c4f9a5229 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk | |||
@@ -314,7 +314,7 @@ ifndef BUILD_NUMBER | |||
314 | # If no BUILD_NUMBER is set, create a useful "I am an engineering build | 314 | # If no BUILD_NUMBER is set, create a useful "I am an engineering build |
315 | # from this date/time" value. Make it start with a non-digit so that | 315 | # from this date/time" value. Make it start with a non-digit so that |
316 | # anyone trying to parse it as an integer will probably get "0". | 316 | # anyone trying to parse it as an integer will probably get "0". |
317 | BUILD_NUMBER := eng.$(shell echo $${USER:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S) | 317 | BUILD_NUMBER := eng.$(shell echo $${BUILD_USERNAME:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S) |
318 | HAS_BUILD_NUMBER := false | 318 | HAS_BUILD_NUMBER := false |
319 | endif | 319 | endif |
320 | .KATI_READONLY := BUILD_NUMBER HAS_BUILD_NUMBER | 320 | .KATI_READONLY := BUILD_NUMBER HAS_BUILD_NUMBER |
diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 738c03731..cdb1d298c 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk | |||
@@ -16,9 +16,10 @@ | |||
16 | # arm emulator specific definitions | 16 | # arm emulator specific definitions |
17 | TARGET_ARCH := arm | 17 | TARGET_ARCH := arm |
18 | 18 | ||
19 | # Note: Before Pi, we built the platform images for ARMv7-A _without_ NEON. | 19 | # Note: Before P, we built the platform images for ARMv7-A _without_ NEON. |
20 | # Note: Before Q, we built the CTS and SDK images for ARMv7-A _without_ NEON. | ||
20 | # | 21 | # |
21 | ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk,$(MAKECMDGOALS)),) | 22 | ifneq ($(TARGET_BUILD_APPS),) |
22 | # DO NOT USE | 23 | # DO NOT USE |
23 | # | 24 | # |
24 | # This architecture variant should NOT be used for 32 bit arm platform | 25 | # This architecture variant should NOT be used for 32 bit arm platform |
diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 1b6429c31..3331d1827 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk | |||
@@ -23,7 +23,7 @@ TARGET_2ND_ARCH := arm | |||
23 | TARGET_2ND_CPU_ABI := armeabi-v7a | 23 | TARGET_2ND_CPU_ABI := armeabi-v7a |
24 | TARGET_2ND_CPU_ABI2 := armeabi | 24 | TARGET_2ND_CPU_ABI2 := armeabi |
25 | 25 | ||
26 | ifneq ($(TARGET_BUILD_APPS)$(filter cts vts sdk,$(MAKECMDGOALS)),) | 26 | ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk vts,$(MAKECMDGOALS)),) |
27 | # DO NOT USE | 27 | # DO NOT USE |
28 | # DO NOT USE | 28 | # DO NOT USE |
29 | # | 29 | # |
@@ -41,7 +41,11 @@ ifneq ($(TARGET_BUILD_APPS)$(filter cts vts sdk,$(MAKECMDGOALS)),) | |||
41 | # | 41 | # |
42 | # DO NOT USE | 42 | # DO NOT USE |
43 | # DO NOT USE | 43 | # DO NOT USE |
44 | ifneq ($(filter cts sdk vts,$(MAKECMDGOALS)),) | ||
45 | TARGET_2ND_ARCH_VARIANT := armv7-a-neon | ||
46 | else | ||
44 | TARGET_2ND_ARCH_VARIANT := armv7-a | 47 | TARGET_2ND_ARCH_VARIANT := armv7-a |
48 | endif | ||
45 | # DO NOT USE | 49 | # DO NOT USE |
46 | # DO NOT USE | 50 | # DO NOT USE |
47 | TARGET_2ND_CPU_VARIANT := generic | 51 | TARGET_2ND_CPU_VARIANT := generic |
diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 07fea22f1..63db56425 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk | |||
@@ -62,6 +62,7 @@ PRODUCT_PACKAGES += \ | |||
62 | CtsShimPrivPrebuilt \ | 62 | CtsShimPrivPrebuilt \ |
63 | debuggerd\ | 63 | debuggerd\ |
64 | DefaultContainerService \ | 64 | DefaultContainerService \ |
65 | dmctl \ | ||
65 | dnsmasq \ | 66 | dnsmasq \ |
66 | DownloadProvider \ | 67 | DownloadProvider \ |
67 | dpm \ | 68 | dpm \ |
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index 6d835fd42..71834aa5e 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk | |||
@@ -100,4 +100,5 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ | |||
100 | 100 | ||
101 | # Enable minidebuginfo generation unless overridden. | 101 | # Enable minidebuginfo generation unless overridden. |
102 | PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ | 102 | PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ |
103 | dalvik.vm.minidebuginfo=true \ | ||
103 | dalvik.vm.dex2oat-minidebuginfo=true | 104 | dalvik.vm.dex2oat-minidebuginfo=true |
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index b76c08954..7286f95b3 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh | |||
@@ -18,8 +18,8 @@ echo "ro.build.version.min_supported_target_sdk=$PLATFORM_MIN_SUPPORTED_TARGET_S | |||
18 | echo "ro.build.date=`$DATE`" | 18 | echo "ro.build.date=`$DATE`" |
19 | echo "ro.build.date.utc=`$DATE +%s`" | 19 | echo "ro.build.date.utc=`$DATE +%s`" |
20 | echo "ro.build.type=$TARGET_BUILD_TYPE" | 20 | echo "ro.build.type=$TARGET_BUILD_TYPE" |
21 | echo "ro.build.user=$USER" | 21 | echo "ro.build.user=$BUILD_USERNAME" |
22 | echo "ro.build.host=`hostname`" | 22 | echo "ro.build.host=$BUILD_HOSTNAME" |
23 | echo "ro.build.tags=$BUILD_VERSION_TAGS" | 23 | echo "ro.build.tags=$BUILD_VERSION_TAGS" |
24 | echo "ro.build.flavor=$TARGET_BUILD_FLAVOR" | 24 | echo "ro.build.flavor=$TARGET_BUILD_FLAVOR" |
25 | if [ -n "$BOARD_BUILD_SYSTEM_ROOT_IMAGE" ] ; then | 25 | if [ -n "$BOARD_BUILD_SYSTEM_ROOT_IMAGE" ] ; then |
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index d71060394..f5163090f 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py | |||
@@ -280,6 +280,7 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): | |||
280 | build_command.extend(["-S", prop_dict["hash_seed"]]) | 280 | build_command.extend(["-S", prop_dict["hash_seed"]]) |
281 | if "ext4_share_dup_blocks" in prop_dict: | 281 | if "ext4_share_dup_blocks" in prop_dict: |
282 | build_command.append("-c") | 282 | build_command.append("-c") |
283 | build_command.extend(["--inode_size", "256"]) | ||
283 | if "selinux_fc" in prop_dict: | 284 | if "selinux_fc" in prop_dict: |
284 | build_command.append(prop_dict["selinux_fc"]) | 285 | build_command.append(prop_dict["selinux_fc"]) |
285 | elif fs_type.startswith("squash"): | 286 | elif fs_type.startswith("squash"): |