Commit Graph

13469 Commits

Author SHA1 Message Date
Elisa Pascual Trevino d57400b494 [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241
am: 44861dc6dd

Change-Id: If466dfd2c187d532256400c542a2365255db8e3f
2018-01-12 20:25:27 +00:00
Elisa Pascual Trevino 44861dc6dd [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev
Bug:71860241
2018-01-12 17:38:16 +00:00
Elisa Pascual Trevino 560b80b913 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev
am: 48539e0ff6

Change-Id: I4ee78230426155da8d620bfed6df81b5073e9de5
2018-01-12 01:44:15 +00:00
Elisa Pascual Trevino 275847767a [DO NOT MERGE] Update security string to 2018-03-01 for oc-dev
Bug:71860241
2018-01-11 22:51:26 +00:00
Adam Seaton 9e67329b15 [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883
am: fb5f3b5add

Change-Id: Ic0f372df927167d890bf29554bc737a6c4aa2b1b
2017-12-14 20:08:30 +00:00
Adam Seaton fb5f3b5add [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev
bug:70348883

Change-Id: I3e6a87e66cd2c113d2f8fc0e9572b0a2744a6515
2017-12-14 17:30:59 +00:00
Adam Seaton 07de097829 Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev
am: 3c12119266

Change-Id: I24ffbb6560091677f6bf71ae0c7c705eb2b894f2
2017-12-14 01:56:13 +00:00
Adam Seaton ee2346fa89 [DO NOT MERGE] Update security string to 2018-02-01 for oc-dev
bug:70348883

Change-Id: Ib87775083eb064c485a44dffcf3b4630d33d39c5
2017-12-13 23:02:17 +00:00
Badash b4bd17c9ad initial add sts to build
am: bb7a920294

Change-Id: I63038aeb98fa6008e1217f8caf7ec749a0ea749e
2017-12-06 18:16:11 +00:00
Badash bb7a920294 initial add sts to build
Test: Local build with other CLs in topic

Bug: 67456333
Change-Id: Ieea499fc22b6dff87dfb19fb8b9446fa449152ea
(cherry picked from commit a4560bb0cb)
2017-12-05 22:17:31 +00:00
Elisa Pascual Trevino ec071e07df [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226
am: b58800a22c

Change-Id: I15c6ee36fe858323759bcd91132b604adf0c3cc5
2017-11-14 00:52:23 +00:00
Elisa Pascual Trevino b58800a22c [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01
Bug: 69257226
2017-11-13 22:23:06 +00:00
Elisa Pascual Trevino ec439b54fb Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev
am: 9a8d84b8ed

Change-Id: I01c2010599a495aec3943cda02ea22f85fdae29d
2017-11-13 21:54:22 +00:00
Elisa Pascual Trevino c53a14f174 [DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05
Bug: 69257226
2017-11-13 19:28:32 +00:00
Adam Seaton 4ec4999b54 Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev
am: 8fdda7d80d

Change-Id: Ib1b6381be2565f9cb5d9e5e8a798de8240592774
2017-11-03 23:54:45 +00:00
Adam Seaton 81ee575d52 Update Security String to 2017-12-05 for December Security
Bug: 67774760
2017-10-23 22:14:35 +00:00
Adam Seaton 893343fa7b Update Security String to 2017-12-01 For December Security Bug: 67774760
am: 47ac5ac8aa

Change-Id: I89f4e9a4c5ec1c57cadb66605643a953f391969b
2017-10-15 01:36:32 +00:00
Adam Seaton 47ac5ac8aa Update Security String to 2017-12-01 For December Security
Bug: 67774760
2017-10-13 18:20:07 +00:00
Adam Seaton 6b7c615cb6 Update Security String to 2017-11-05 on oc-dev bug:65631379
am: d24487a2f2

Change-Id: Ib474659c9e72e5ad803a0e28f9fb11b7057d4939
2017-09-13 21:30:22 +00:00
Adam Seaton 8e3eac06fb Update Security String to 2017-11-01 on oc-dev bug:65631379
am: 8f4a4c2131

Change-Id: Iee28cf19c5020c8dde26c1a25a92609ee7221c8d
2017-09-13 21:29:44 +00:00
Adam Seaton d24487a2f2 Update Security String to 2017-11-05 on oc-dev bug:65631379 2017-09-13 10:51:18 -07:00
Adam Seaton 8f4a4c2131 Update Security String to 2017-11-01 on oc-dev bug:65631379 2017-09-13 10:46:41 -07:00
Adam Seaton f3ae135ddb Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74

Change-Id: Idc4c93c54a778c37b5d916ef9dc71eaafc8eff89
2017-08-22 22:37:48 +00:00
Adam Seaton 834db8c201 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000

Change-Id: I26c3283c5fd33ee1e930840ad6b82019eba1ebc6
2017-08-22 22:37:00 +00:00
Adam Seaton 4e140ce86a Update platform security string to 2017-10-05 in oc-dev Bug:64896113 2017-08-21 11:37:32 -07:00
Adam Seaton 80d3742026 Update platform security string to 2017-10-01 in oc-dev Bug:64896113 2017-08-21 11:36:54 -07:00
Ian Pedowitz 47f1b93dfa v8.0.0 was only temporary. O-DR is 8.0.0
Fixes: 64130669
Fixes: 64125438
Fixes: 64437834
Test: Flashed oc-dr1-dev ToT and ensured device booted
Test: Rebuilt with topic:ODR-8.0.0 and reflashed without wipe
Test: device booted
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: I1316358d0121b82902ac708088a49d480f3a6ad4
2017-08-09 12:06:37 -07:00
Bart Sears a302746d9b Change Android version to v8.0.0
Change PLATFORM_VERSION.OPD1 to v8.0.0.  This is a temporary
change until we get a new KeyMaster that can handle going from
8.0.1 -> 8.0.0.  At that point we will change PLATFORM_VERSION
to 8.0.0.

Test: Check: Settings > System > About phone > Android version.
Also verified that update from 8.0.1 to v8.0.0 works (i.e. device
boots and shows new Android Version).
Bug: 64130669
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: Ibb8fbb123a74196f57f649d0c22f58beefaf6d06
2017-08-03 16:23:59 -07:00
TreeHugger Robot 7740a78495 Merge "Fix potential build break" into oc-dev 2017-07-24 16:50:08 +00:00
Adam Seaton c7d9294cd9 Merge changes I7c8a25a2,Ifb32d061 into oc-dev
am: 683c44c812

Change-Id: Ifd90edf581b976684da3a5b9fa2a6dc3ac7102da
2017-07-20 20:57:46 +00:00
Adam Seaton 32f388f655 Updating Security String to 2017-09-05 Bug:63846344 2017-07-19 10:42:03 -07:00
Adam Seaton f1c17f17ff Updating Security String to 2017-09-01 Bug:63846344 2017-07-19 10:41:05 -07:00
Hung-ying Tyan 58c1b0426f Fix potential build break
When BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED is enabled, the build system
may attempt to create a symlink in TARGET_ROOT_OUT before TARGET_ROOT_OUT
is created. Also make the symbolic link depend on
INSTALLED_DEFAULT_PROP_TARGET so that the symbolic link is properly created
when only bootimage is made.

Bug: 63645797
Test: on non-A/B device, make installclean && make bootimag and then verify
      that the symbolic link exists at $(TARGET_ROOT_OUT)/default.prop
Change-Id: Id12916b465ff052e2594b79f28274be20ca53af7
Merged-In: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
2017-07-19 22:42:05 +08:00
Bowgo Tsai 9e95beab31 Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" in BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS
instead of INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS. The former setting will
be propogated to `make dist` while the latter is only used for `make`.

Bug: 38454093
Test: `make dist` and check vbmeta.img is being padded.
Change-Id: I929288b218761a4637a2a2ef0679d3ff85c70731
2017-06-30 12:13:15 +08:00
TreeHugger Robot 3b7460eda9 Merge "Move /default.prop to /system/etc/prop.default" into oc-dr1-dev 2017-06-28 06:28:10 +00:00
Hung-ying Tyan f829b40c48 Move /default.prop to /system/etc/prop.default
This patch tries to fix the problem where the default properties need
to go with the system image especially on non-AB devices where
/default.prop is on the ramdisk image. A symlink is created at
/default.prop for backward compatibility.

Bug: 37815285
Test: Tested with ag/2416542. Booted pixel phones, checked the location
      of prop.default, verified the symlink, checked a few properties
      (via adb shell getprop) and manually tested a few apps (Camera,
      Maps etc).
      sign_target_files_apks.py was tested with:
      sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
          -e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
          -e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
      Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
2017-06-27 15:05:17 +08:00
Dimitry Ivanov 7caea14111 Enable linker warning toast for userdebug/eng builds
We did not want this to appear for dogfood devices before
because it was noisy, most of popular apps fixed this
problem and it should be much less noisy.

Bug: http://b/62455348
Test: make
Change-Id: Icd28e9ef87f2d1edf456d178741c67ef42670ae1
2017-06-22 14:53:10 -07: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
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
Yifan Hong 84cbe4353c LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK
Test: m -j -k BOARD_VNDK_VERSION=true

Bug: 37342627

Change-Id: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
Merged-In: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
2017-06-20 15:42:54 -07:00
Nicolas Geoffray 8be30c47d7 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev
am: 0081d76597

Change-Id: I81039c2b5d1ae202e4cbca43e98322e15ab5c3e9
2017-06-15 14:42:18 +00:00
Nicolas Geoffray 0081d76597 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev 2017-06-15 14:06:10 +00:00
Nicolas Geoffray c3ffeddc59 Add a new PRODUCT variable for forcing 'speed' preopt.
bug: 35872915
Test: build

(cherry picked from commit 4a0ad4ac61)

Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-15 12:40:15 +01:00
TreeHugger Robot 7f0e79b146 Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev 2017-06-14 04:13:42 +00:00
Bowgo Tsai 53cf999923 Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" when making vbmeta.img.

Bug: 38454093
Test: build vbmeta.img and check it's being padded.
Change-Id: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
Merged-In: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
(cherry picked from commit 7cd30041e9)
2017-06-14 10:14:24 +08:00
Hung-ying Tyan d9657ef5be Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev 2017-06-14 02:13:51 +00:00
TreeHugger Robot 6652dd9005 Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev 2017-06-13 19:43:02 +00:00
Jeff Vander Stoep 716b768594 Build split file_contexts for recovery
am: 4ff042c4aa

Change-Id: I9eff1afef9e427c2e97a64b663a029ef33a8ac4a
2017-06-13 18:00:03 +00:00