Commit Graph

1724 Commits

Author SHA1 Message Date
Nan Zhang 972bd248f9 Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd am: 90b8d087e6
am: 7e634580ba

Change-Id: I514525914843c2cad6591ed6f515aed3aecc286a
2018-02-22 02:36:22 +00:00
Nan Zhang 0abdb5811d Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.
<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.

Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
2018-02-21 14:12:18 -08:00
Dan Willemsen b5ab2c7828 Merge "Revert^2 "Replace $(shell find | sort) with $(sort $(shell find))"" 2018-02-19 22:51:11 +00:00
Jaekyun Seok 9cbf2e00df Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" am: 42c7cf0631 am: cae2ca8ef5
am: aabb24c3fc

Change-Id: Ic36f71be5b0d900f13c4d7eb2cb56391110ac90d
2018-02-14 01:04:42 +00:00
Treehugger Robot 42c7cf0631 Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" 2018-02-14 00:30:23 +00:00
Tao Bao 5232f099f6 Revert^2 "Replace $(shell find | sort) with $(sort $(shell find))"
This reverts commit 14a3217ff9.

Reason for revert: Wrong blame for b/73143444.

Change-Id: Ibb23349fcbb3c1b855afdd426317e8d2d4fc0adc
2018-02-10 04:03:32 +00:00
Tao Bao 14a3217ff9 Revert "Replace $(shell find | sort) with $(sort $(shell find))"
This reverts commit be0b6cee4f.

Reason for revert: b/73143444

Change-Id: I51800646b816d639b40ee1f012b1bf225c04e0b6
(cherry picked from commit 586c8821083ad1bec874d6de5ab378dbb47dee58)
2018-02-09 19:05:19 -08:00
Colin Cross de2d9195ff Merge "Move to-upper and to-lower to definitions.mk" am: 74413198b7 am: 7209b4066b
am: 3c508d0b3d

Change-Id: I73f796d5a53f57210f5fad53ca47bbe8af1e59f2
2018-02-09 18:51:06 +00:00
Colin Cross 18fae7a32e Move to-upper and to-lower to definitions.mk
So they can be used by art/test/Android.run-test.mk.

Also remove the line wrapping, which was inserting extra characters
at the beginning of the result, and add a sanity check.

Bug: 26275726
Test: no change to out/build-hikey960-test-art.ninja
Change-Id: I35b54c258a1dc76bb1a8a758ec4a08915a2b226d
2018-02-08 16:03:17 -08:00
Jaekyun Seok c227ce7c25 Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED can be true only if early-mount of
partitions is supported. But the early-mount must be supported for full
treble products, and so BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED should be
set by default for full treble products.

Additionally this CL sets ro.vndk.version regardless of
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED.

Bug: 73078796
Test: tested with walleye
Change-Id: Icfe1b6957b55b0f9261d34d7e92db3dc5073cb58
2018-02-08 11:49:16 +09:00
Isaac Chen 585c2960b8 Merge "Add ro.vendor.product.cpu.* to vendor/build.prop" am: b943fb63bf am: f82423f012
am: 1b9a60bae5

Change-Id: I7e03498399edafd4ad298a65bf594bab0ab1f9ed
2018-02-07 02:42:24 +00:00
Isaac Chen b943fb63bf Merge "Add ro.vendor.product.cpu.* to vendor/build.prop" 2018-02-07 01:57:12 +00:00
Dan Willemsen 246a7ee4cc Merge "Replace $(shell find | sort) with $(sort $(shell find))" am: 9f573a420e am: 0991eed377
am: 5c1bb42d60

Change-Id: I088e34a44d2b31c341c840fd59b886a99edc9661
2018-02-06 22:59:45 +00:00
Dan Willemsen be0b6cee4f Replace $(shell find | sort) with $(sort $(shell find))
Kati's find emulator doesn't understand "| sort", so use use the make
function instead so that we can emulate the find commands.

 before: *kati*: shell time (regen): 1.316989 / 187
 after:  *kati*: shell time (regen): 1.249748 / 184

The time has a lot of variance, the important change is the reduction in
number of shell commands. Kati has other issues with some of these (it
doesn't support find's implicit -a), which is why it only goes down by
3. I'll be fixing Kati separately to handle those cases.

Test: diff out/build-aosp_taimen.ninja before&after
Change-Id: I5c8c2993f01a8a6af84963e903a8a0c186a61e82
2018-02-05 23:07:58 -08:00
Bowgo Tsai 66f0285f4d Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 8b35ac67b2 am: 7d4299612b
am: 310f79ae18

Change-Id: I5a0101b1552f20b492bb94b3f5a5f2d6e6642306
2018-02-05 17:53:06 +00:00
Bowgo Tsai 09f88a6b88 Renames sepolicy files from nonplat_* to vendor_*
Bug: 64240127
Test: boot bullhead/taimen
2018-02-05 18:22:45 +08:00
Bowgo Tsai 90f5adfbbf Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 8a6ab0f240 am: 6703b82a0c
am: 5d4cc6de47

Change-Id: Ibe09ff8507355ba58dfd8e5d76d518fc6cc34b34
2018-02-03 10:13:22 +00:00
Bowgo Tsai ec7dbbb537 Revert "Renames sepolicy files from nonplat_* to vendor_*"
This reverts commit 8b5f514038.
Fix angler/bullhead boot failure.

Bug: 72787689
Test: build
2018-02-02 07:58:45 +08:00
Bowgo Tsai e419d370da Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 5e7d417271 am: 897c432036
am: 8f03b86120

Change-Id: I4b38dcd1cc0f85c61c57d113df02fc45a714649d
2018-01-31 14:51:51 +00:00
Isaac Chen 8d11febd59 Add ro.vendor.product.cpu.* to vendor/build.prop
CPU/ABIs related information is already in system/build.prop. It
should also be included in the vendor image so it can still be
examined outside of a device, build environment, or $OUT directory,
by a standalone utility to check its basic characteristics and if
it's compatible with some specific system image (usually GSI).

Bug: 72079894
Test: Built and verified aosp_x86(_64):
      # On host
      $ grep ro.vendor.product.cpu $OUT/vendor/build.prop
      # On device
      $ getprop | grep ro.vendor.product
      $ su
      # grep ro.vendor.product /vendor/build.prop

Change-Id: Ic9ac8065d5983710840e33a805f982de75d86ce3
2018-01-31 14:27:37 +08:00
Bowgo Tsai 8b5f514038 Renames sepolicy files from nonplat_* to vendor_*
Bug: 64240127
Test: boot an existing device
Change-Id: I6d6ac7d9dee450b2a20649e5f4dbb8976f48061e
2018-01-30 16:15:12 +08:00
Pirama Arumuga Nainar 4103f7701e Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR" am: d33cac8af1 am: 7760fdff02
am: 64e15096e5

Change-Id: I4149b8650a3d1234034355f88a38f97e41a0abba
2018-01-30 06:48:03 +00:00
Treehugger Robot d33cac8af1 Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR" 2018-01-30 06:34:15 +00:00
Pirama Arumuga Nainar ae9595674b Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR
Bug: http://b/72642679

Store missing profile files and the modules that refer to them, passed
via SOONG_MODULES_MISSING_PGO_PROFILE_FILE variable, to
$DIST_DIR/pgo_profile_file_missing.txt as part of the 'dist' target.

Test: 'm dist' and verify creation of pgo_profile_file_missing.txt.
Change-Id: I4ac0a1f413cbb99b33ad1903aeebd3ebcf3b9f59
2018-01-29 14:48:08 -08:00
Steven Moreland 15f6a241ca Merge "Fix INSTALLED_ -> BUILT_ missing refactor piece." am: 98fce11494 am: a7f62c3864
am: e08d290862

Change-Id: I7818b32a508854e7815c484e8bd0284cd94733f0
2018-01-26 00:17:16 +00:00
Treehugger Robot 98fce11494 Merge "Fix INSTALLED_ -> BUILT_ missing refactor piece." 2018-01-25 21:23:28 +00:00
Steven Moreland 915f35166f Fix INSTALLED_ -> BUILT_ missing refactor piece.
Some of the dependencies for target-files-package were
refactored but only partially. Since these are satisfied
by transitive dependencies, the problem wasn't noticed
earlier.

Bug: N/A
Test: target-files-package finds dependencies

Change-Id: Ibdd7587f87735148e55d3b9835478075b6547efc
2018-01-25 10:45:26 -08:00
Jaekyun Seok d1b1d594a5 Merge "Support /product partition" am: 8fe7f9bfa2 am: 039e0991d5
am: f430ea5ebf

Change-Id: I91381c19408afc350ba7cecf2ca6daf0881f9abd
2018-01-25 04:16:57 +00:00
Jaekyun Seok b7735d8105 Support /product partition
This CL adds the following build flags to support building product partition
from Android build system.
- BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS
- BOARD_AVB_PRODUCT_KEY_PATH
- BOARD_AVB_PRODUCT_ALGORITHM
- BOARD_AVB_PRODUCT_ROLLBACK_INDEX_LOCATION
- BOARD_PREBUILT_PRODUCTIMAGE
- BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT
- BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE
- BOARD_PRODUCTIMAGE_PARTITION_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR_OPT
- BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN
- BOARD_USES_PRODUCTIMAGE
- LOCAL_PRODUCT_MODULE
- PRODUCT_FOOTER_ARGS
- PRODUCT_PRODUCT_BASE_FS_PATH
- PRODUCT_PRODUCT_VERITY_PARTITION
- TARGET_COPY_OUT_PRODUCT
- TARGET_OUT_PRODUCT*

And PRODUCT_PRODUCT_PROPERTIES is added to save product-specific
properties in /product/build.prop.

Bug: 64195575
Test: succeeded building product.img with BOARD_PRODUCTIMAGE_PARTITION_SIZE,
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE and PRODUCT_PRODUCT_VERITY_PARTITION.

Change-Id: I774e6a38003734421591e51bed103802ff84f432
2018-01-25 09:33:58 +09:00
Jin Qian 95873268f3 Merge "Add BOARD_EXT4_SHARE_DUP_BLOCKS to share duplicated blocks on ext4" am: 082837365d am: b6ff980ba5
am: 931d76e1c4

Change-Id: I8bfcd310517c8814907e55b1a328c29392612872
2018-01-24 04:21:38 +00:00
Jin Qian fde9f7906b Add BOARD_EXT4_SHARE_DUP_BLOCKS to share duplicated blocks on ext4
This option applies to system.img and vendor.img.

Bug: 64109868
Change-Id: Ib4c7384049dca08e57441ef71cc81c2fba4462dd
2018-01-22 17:21:11 -08:00
Sen Jiang 1e1c35d051 Merge "Remove zlib_fingerprint support." am: 53a3f70efe am: 2dfaacdd93
am: c5ed82950b

Change-Id: I25e86717bfaf7f22e41d417d16f7b18d55f26ff1
2017-12-27 21:00:08 +00:00
Treehugger Robot 53a3f70efe Merge "Remove zlib_fingerprint support." 2017-12-27 20:49:24 +00:00
Sen Jiang 43935639fb Remove zlib_fingerprint support.
Test: m dist
Change-Id: I580993e5089b3eb73af0ee931dd222ebfd3a8593
2017-12-20 13:14:14 -08:00
Tao Bao 90a2bcc3e0 Merge "Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS." am: d30b75190d am: 4d45f51596
am: 3652c0ba76

Change-Id: I3cd249a50eea521d019ed9b2745a62dd850df537
2017-12-18 22:31:32 +00:00
Treehugger Robot d30b75190d Merge "Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS." 2017-12-18 22:17:46 +00:00
Baligh Uddin 92855dba09 Merge "Add generate_verity_key (+dependencies) to otatools package." am: c4f76d670a am: d60a86c3ca
am: 10882a317c

Change-Id: Id7467e4b6a629954e103cb8ab6aa52113037ea2c
2017-12-18 20:50:07 +00:00
Baligh Uddin c8bef14c9f Add generate_verity_key (+dependencies) to otatools package. 2017-12-18 10:40:57 -08:00
Steven Moreland 85d325b5f8 Merge changes from topic "kati-obsolete-full-treble" am: 2b1f0d1810 am: a710d44086
am: 9874ee6c54

Change-Id: I991823b6dacb829982a0d03c06c00c341cace96a
2017-12-18 18:06:07 +00:00
Steven Moreland ae69e5787a PRODUCT_NOTICE_SPLIT from PRODUCT_FULL_TREBLE
- until PRODUCT_NOTICE_SPLIT is the default
- disallow PRODUCT_NOTICE_SPLIT_OVERRIDE because it
  doesn't need to be differentiated.

Bug: 69865032
Test: manual
Change-Id: I4a29c298862fc9fab51755bf19f236f61fbd784d
2017-12-15 14:52:07 -08:00
Przemyslaw Szczepaniak 6686e51b75 Merge "Add PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION" 2017-12-13 10:15:46 +00:00
Treehugger Robot 973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
Justin Yun 2a233b3b86 Define PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".

Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
2017-12-13 10:48:34 +09:00
Przemyslaw Szczepaniak e554015b3a Add PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION
Exposed as ro.build.version.min_supported_target_sdk build_property

Test: make
Bug: 63926630
Change-Id: I8084fd4c54d9c2fb5e2683430e2b3aaf4c5f4a7a
2017-12-11 10:45:45 +00:00
Jaegeuk Kim 10c9f5d9d3 Merge "core, release: add sload.f2fs for otatools.zip" 2017-12-08 00:57:42 +00:00
Tao Bao 79d52f8798 Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS.
This is only used in file-based OTA, where we may reserve space on
/system partition. With the deprecation of file-based OTA since O, the
code has become obsolete.

Test: `m dist`
Change-Id: I2bd686b292f93b566fe28a2bcd74c564ffc75dac
2017-12-07 14:36:21 -08:00
Treehugger Robot 94ea878ae0 Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" 2017-12-07 04:02:29 +00:00
Bo Hu 9eb4d74e26 Revert "Renames sepolicy files from nonplat_* to vendor_*"
This reverts commit 38c404c6da.
Reason for revert: broke mac build

b/70273082

FAILED: out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil
/bin/bash -c "(out/host/darwin-x86/bin/version_policy -b out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil -t out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil -n 10000.0 -o out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp ) && (grep -Fxv -f out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp > out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil ) && (out/host/darwin-x86/bin/secilc -m -M true -G -N -c 30 		out/target/product/generic_x86/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/10000.0.cil_intermediates/10000.0.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil -o /dev/null -f /dev/null )"
Parsing out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil
Parsing out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil
grep: out of memory

Change-Id: I5b043fc6b5939456184ffb296cd00b3943a899f9
2017-12-07 00:16:35 +00:00
Colin Cross fdea893833 Replace build/tools with build/make/tools
Test: m checkbuild
Change-Id: I8db6c27a6d2372f142d10568fe92d6f2e9a59252
2017-12-06 16:12:40 -08:00
Colin Cross 3277ba34ae Add java modules to soong_to_convert.txt
Test: examine soong_to_convert.txt
Change-Id: Ibb6db664238a4e98f5d8885dfb3ddc0f35d11ff6
2017-12-06 15:38:52 -08:00