Commit Graph

38491 Commits

Author SHA1 Message Date
Tianjie Xu 8fb65a5d63 Merge "Remove the obsolete location check for install-recovery.sh" 2017-06-22 18:12:44 +00:00
Tianjie Xu 924c1c0598 Merge "Verify the contents in install-recovery.sh" 2017-06-22 18:12:44 +00:00
Jiyong Park 2d42f8e81c Merge "Add LOCAL_OVERRIDES_MODULES" am: f1610d82f9 am: 9089f867d4
am: 3487a6127d

Change-Id: I078d76688526881bb77766875f8875a8b0a6696f
2017-06-22 04:59:10 +00:00
Jiyong Park 3487a6127d Merge "Add LOCAL_OVERRIDES_MODULES" am: f1610d82f9
am: 9089f867d4

Change-Id: I3966676c72a0bb734da8c71765fc900fcfe85eb9
2017-06-22 04:56:12 +00:00
Jiyong Park 9089f867d4 Merge "Add LOCAL_OVERRIDES_MODULES"
am: f1610d82f9

Change-Id: I5af8bf3eb789574aa804403de4d946552c9b9fbd
2017-06-22 04:52:39 +00:00
Treehugger Robot f1610d82f9 Merge "Add LOCAL_OVERRIDES_MODULES" 2017-06-22 04:49:41 +00:00
Chih-hung Hsieh 5b32a83244 Merge "Add OWNERS in build/make" am: d79ce64555 am: 9af11fce7a
am: 877a7a43d2

Change-Id: I2735fa634707e419da3416fd05ba67ed9c498c57
2017-06-22 04:38:08 +00:00
Chih-hung Hsieh 877a7a43d2 Merge "Add OWNERS in build/make" am: d79ce64555
am: 9af11fce7a

Change-Id: I44e3689a9280de474055ec4f109278ef2ff7d8cf
2017-06-22 04:34:38 +00:00
Chih-hung Hsieh 9af11fce7a Merge "Add OWNERS in build/make"
am: d79ce64555

Change-Id: Ic4bfd5c9d8756055faa6781772d93bca801e114d
2017-06-22 04:31:07 +00:00
Chih-hung Hsieh d79ce64555 Merge "Add OWNERS in build/make" 2017-06-22 04:27:13 +00:00
Chris Fries ec462e6f90 Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" am: ccac0f861b am: ba0be93555
am: abd4388b4c

Change-Id: Ife96fb48d2547136559d18ef7412f3939bbdf852
2017-06-21 23:19:13 +00:00
Chris Fries abd4388b4c Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" am: ccac0f861b
am: ba0be93555

Change-Id: I1b6a9b8f05d10738267a51da65bd404242885e6c
2017-06-21 23:16:31 +00:00
Chris Fries ba0be93555 Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS"
am: ccac0f861b

Change-Id: I9e8c86f81543efd95b90f2804ab58a6f8edec695
2017-06-21 23:13:43 +00:00
Chih-Hung Hsieh 044fc0c4a4 Add OWNERS in build/make
* Owners are selected from top CL approvals or owners.
  They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
  https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ibe6765e5448c471ca413413e3d052507ccee4ea6
2017-06-21 16:09:56 -07:00
Treehugger Robot ccac0f861b Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" 2017-06-21 23:06:19 +00:00
Chris Fries df0387ddab Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS
.. in order to let the system_other image use it.

Bug: 33203383 Can't build target on mac
Change-Id: Iac2faf0ebdcc933675afbec2301d5d455aa33501
2017-06-21 16:19:35 -05:00
Bowgo Tsai 472c1c024e Merge "Use make functions to convert a text to lower case" into oc-dr1-dev
am: c74abeba1f  -s ours

Change-Id: I8d56a2fc9d5137f7416c99eba7df77a7ab129d35
2017-06-21 16:31:21 +00:00
Bowgo Tsai 11cfd3e5b8 Merge "AVB: support chain partition signing" into oc-dr1-dev
am: 680b29e718  -s ours

Change-Id: I5920f9e7b38268ef4cbcc590452198cf067ab973
2017-06-21 16:30:43 +00:00
TreeHugger Robot c74abeba1f Merge "Use make functions to convert a text to lower case" into oc-dr1-dev 2017-06-21 16:26:45 +00:00
TreeHugger Robot 680b29e718 Merge "AVB: support chain partition signing" into oc-dr1-dev 2017-06-21 16:26:25 +00:00
Yifan Hong 97d390295e Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" into oc-dr1-dev
am: 121c2a8fb4  -s ours

Change-Id: If80716c0002e6ee9da0340af56dd62029cbeaf20
2017-06-21 07:33:36 +00:00
TreeHugger Robot 121c2a8fb4 Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" into oc-dr1-dev 2017-06-21 07:27:04 +00:00
Colin Cross 08447ecb65 Merge "Add make sync target" am: 564ce0fa53 am: 5d848ba50a
am: 38e8c8bc8c

Change-Id: Icb76f4f3aebdc181c29e6ada0e60e138b21d8b5f
2017-06-21 03:06:46 +00:00
Dan Willemsen 0e59a32e8f Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb am: 616764b247
am: b2f7189479

Change-Id: Id6875b2ae03daec9d7b4547fa1c151cb5c12ebb9
2017-06-21 03:06:30 +00:00
Colin Cross 38e8c8bc8c Merge "Add make sync target" am: 564ce0fa53
am: 5d848ba50a

Change-Id: I384460e7373aec904a4779d8af1648f20c004ff8
2017-06-21 03:00:47 +00:00
Android Build Merger (Role) 3d715ec019 Merge "Add audio.a2dp.default to generic system image am: fbac1195e9 -s ours am: dba174c8a5 -s ours" into oc-dr1-dev-plus-aosp 2017-06-21 03:00:45 +00:00
SzuWei Lin 0d1261f2d5 Add audio.a2dp.default to generic system image am: fbac1195e9 -s ours
am: dba174c8a5  -s ours

Change-Id: I4a8e4218013343c1368dc301559f89617386cb83
2017-06-21 03:00:33 +00:00
SzuWei Lin d2a1c31bdb Add audio.a2dp.default to generic system image am: fbac1195e9
am: ef8e26b220  -s ours

Change-Id: Ifdc24d8b0a3827f4a6ee42cb2ba2cf94cba7f536
2017-06-21 03:00:32 +00:00
Dan Willemsen b2f7189479 Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb
am: 616764b247

Change-Id: I288d04b2e69c7f231f25905edcff19b31c6cf499
2017-06-21 03:00:30 +00:00
Colin Cross 5d848ba50a Merge "Add make sync target"
am: 564ce0fa53

Change-Id: I88271ab1c71ce4c1fe9e7110bd8cf3861a4d28f6
2017-06-21 02:54:49 +00:00
Dan Willemsen 616764b247 Merge "Support custom my_copy_pairs in package-modules.mk"
am: 5b91bd4ccb

Change-Id: I87afb199ec7504ca0c927332a641f93587a8480e
2017-06-21 02:54:31 +00:00
SzuWei Lin dba174c8a5 Add audio.a2dp.default to generic system image
am: fbac1195e9  -s ours

Change-Id: I15cf602e840d3ac60e5c932fdb02099903349898
2017-06-21 02:48:33 +00:00
SzuWei Lin ef8e26b220 Add audio.a2dp.default to generic system image
am: fbac1195e9

Change-Id: I0a5f13ec32cfac2caa5dbb8e979fb0dffa54be5e
2017-06-21 02:48:32 +00:00
Treehugger Robot 564ce0fa53 Merge "Add make sync target" 2017-06-21 02:42:28 +00:00
Treehugger Robot 5b91bd4ccb Merge "Support custom my_copy_pairs in package-modules.mk" 2017-06-21 02:36:14 +00:00
Bowgo Tsai c1ccae5009 Merge "Use make functions to convert a text to lower case" am: cd46f1012e am: 5a7d87afce
am: 98e356910f

Change-Id: I4b2676842f25f4bc4e59c8be307892f22e53de95
2017-06-21 02:23:58 +00:00
Bowgo Tsai fbcd0412c7 Use make functions to convert a text to lower case
We cannot cache the result of ($shell ...) and we have to run these on
every build even if we don't have to re-read the makefiles. Replace it
with make functions $(substr $(substr ... )).

Bug: 38399657
Test: `make` pass, flash images from $OUT and boot device with chain partitions
Merged-In: I6d4ff8e487931ba25008a2a881401a8951d4049e
Change-Id: I6d4ff8e487931ba25008a2a881401a8951d4049e
(cherry picked from commit e615afd6d0)
2017-06-21 10:22:59 +08:00
Bowgo Tsai f636a80888 AVB: support chain partition signing
Current build system will include AVB metadata from each partition and
store them into /vbmeta partiton when BOARD_AVB_ENABLE is set, which makes
each partition tightly-coupled.

Add the support for 'chain partition':
  - The vbmeta of each partition is stored on the same partition itself.
  - The public key used to verify each partition is stored in /vbmeta.

For example, the following build variables are required to enable chain
partition for system partition:
  - BOARD_AVB_SYSTEM_KEY_PATH := path/to/system_private_key
  - BOARD_AVB_SYSTEM_ALGORITHM := SHA512_RSA8192
  - BOARD_AVB_SYSTEM_ROLLBACK_INDEX := 1
  - BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 2

The corresponding settings will be added into META/misc_info.txt for
build_image.py and/or add_img_to_target_files.py:
  - avb_system_key_path=path/to/system_private_key
  - avb_system_algorithm=SHA512_RSA8192
  - avb_system_add_hashtree_footer_args=--rollback_index 1
  - avb_system_rollback_index_location=2

To enable chain partition for other partitions, just replace SYSTEM with
BOOT, VENDOR and/or DTBO in the build variables.

Also switch from  `avbtool make_vbmeta_image --setup_rootfs_from_kernel system.img ...`
to `avbtool add_hashtree_footer --image system.img --setup_as_rootfs_from_kernel...`
when BOARD_BUILD_SYSTEM_ROOT_IMAGE is true. This works for both chained
and no-chained:
  - chained: `avbtool add_hashtree_footer --setup_as_rootfs_from_kernel` will
    add dm-verity kernel cmdline descriptor to system.img
  - no-chained: `avbtool make_vbmeta_image --include_descriptors_from_image
    system.img` will include the kernel cmdline descriptor from system.img into
    vbmeta.img

Bug: 38399657
Test: `make` pass, flash images from $OUT and boot device without chain partitions
Test: `make` pass, flash images from $OUT and boot device with chain partitions
Test: `make dist` pass, flash images from TF.zip and boot device without chain partitions
Test: `make dist` pass, flash images from TF.zip and boot device with chain partitions
Test: follow the same steps in
      https://android-review.googlesource.com/#/c/407572/

Change-Id: I344f79290743d7d47b5e7441b3a21df812a69099
Merged-In: I344f79290743d7d47b5e7441b3a21df812a69099
(cherry picked from commit 3e599ead66)
2017-06-21 10:22:38 +08:00
Bowgo Tsai 98e356910f Merge "Use make functions to convert a text to lower case" am: cd46f1012e
am: 5a7d87afce

Change-Id: I5da050178795dce0333b74ca91a7c18968ea5bd7
2017-06-21 02:18:31 +00:00
Bowgo Tsai 5a7d87afce Merge "Use make functions to convert a text to lower case"
am: cd46f1012e

Change-Id: I737210f72379b1c77e8568556a1185bbc0c6bb16
2017-06-21 02:12:58 +00:00
SzuWei Lin e7a5506e1f Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev
am: 4e08677575

Change-Id: I45aa7f7055dd4fe874daa2b1c2c8f8f317fe2f5a
2017-06-21 02:06:57 +00:00
TreeHugger Robot 4e08677575 Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev 2017-06-21 01:57:53 +00:00
Treehugger Robot cd46f1012e Merge "Use make functions to convert a text to lower case" 2017-06-21 01:56:08 +00:00
Yifan Hong d728b292b1 Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce am: 7dbc8e08ce
am: ba5a198625

Change-Id: Iaa40b19c94c425b74a93d64c33bc5aa06f8c2690
2017-06-21 00:53:55 +00:00
Yifan Hong ba5a198625 Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce
am: 7dbc8e08ce

Change-Id: I99525848d5e12269351d18e237ea1e3f82967420
2017-06-21 00:49:25 +00:00
Yifan Hong 7dbc8e08ce Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK"
am: 3952eef8ce

Change-Id: I651ac922ea336c79880a3727cab621bb7167d20d
2017-06-21 00:44:54 +00:00
Treehugger Robot 3952eef8ce Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" 2017-06-21 00:33:24 +00:00
Tianjie Xu 9c384d2ca5 Verify the contents in install-recovery.sh
Check the SHA1 of recovery.img and boot.img embedded in the
install-recovery.sh.

Bug: 35411009
Test: validation script detects mismatch for both full recovery and
recovery-from-boot.
Change-Id: I5f07a869d9fa17fad26a22ef9ca3ecb06b1b28e3
2017-06-20 17:28:35 -07:00
Colin Cross 91a52277b0 Add make sync target
make sync will build everything necessary to adb sync system
and vendor, without wasting time rebuilding system.img and
vendor.img.

Test: m -j sync
Change-Id: I91c0012eed6d58a338393cc375056a30e2a24b09
2017-06-20 16:57:52 -07:00
Tianjie Xu 78de9f173d Remove the obsolete location check for install-recovery.sh
The script has been moved to /system/bin since L.

Bug: 35411009
Test: Generate a exact same OTA for bullhead.
Change-Id: Iaecb86e3dabc5b659605837bb06f16d20fa80334
2017-06-20 16:52:54 -07:00