Commit Graph

33406 Commits

Author SHA1 Message Date
Jaekyun Seok c77a9a7888 Merge "Prevent abuse of property overrides" am: 7ae18449ec am: c96ffae29f
am: 5675d28df7

Change-Id: I716b89ef4b1b2fef99725b170ea5be0c09822374
2017-01-25 07:23:25 +00:00
Jaekyun Seok 5675d28df7 Merge "Prevent abuse of property overrides" am: 7ae18449ec
am: c96ffae29f

Change-Id: Ife1f31f6e33f5fdaacb5bb8acf51b9c1c8a2a098
2017-01-25 07:21:24 +00:00
Jaekyun Seok c96ffae29f Merge "Prevent abuse of property overrides"
am: 7ae18449ec

Change-Id: I035eab9562c13747d6a6917bb7be3dad81348ff6
2017-01-25 07:18:54 +00:00
Treehugger Robot 7ae18449ec Merge "Prevent abuse of property overrides" 2017-01-25 07:15:09 +00:00
Jaekyun Seok 7ace0d60ef Prevent abuse of property overrides
To prevent abuse of PRODUCT_*PROPERTY_OVERRIDES and
ADDITIONAL*PROPERTIES, the following rules should be applied.

- Mark PRODUCT_*PROPERTY_OVERRIDES readonly after reading product
 specs.
- Disallow any changes on ADDITIONAL*PROPERTIES from product specs
 and BoardConfig.mk.
- Mark ADDITIONAL*PROPERTIES readonly before reading Android.mk
 files.

Test: building succeeded on marlin-userdebug.
Bug: 34116668
Change-Id: I93d8de086ec85ba787165a156bdcc7df04310be1
(cherry picked from commit 294286d95c)
2017-01-25 13:00:25 +09:00
Tao Bao f327bff73f Merge "Revert "releasetools: Generate streamable A/B OTA packages."" am: 5ce7034463 am: e8468634be
am: 44c7467c11

Change-Id: Ifcfd1100edbe52221a9e11a263a6990ecdf87377
2017-01-25 01:53:01 +00:00
Tao Bao 44c7467c11 Merge "Revert "releasetools: Generate streamable A/B OTA packages."" am: 5ce7034463
am: e8468634be

Change-Id: I96d5798141d580cb6648cebe5d675c16a9c244ea
2017-01-25 01:51:01 +00:00
Tao Bao e8468634be Merge "Revert "releasetools: Generate streamable A/B OTA packages.""
am: 5ce7034463

Change-Id: If2a3ee497124b87d1ff3c6bb10a05065c856bd96
2017-01-25 01:49:00 +00:00
Tao Bao 5ce7034463 Merge "Revert "releasetools: Generate streamable A/B OTA packages."" 2017-01-25 01:45:45 +00:00
Tao Bao ea4325baf8 Revert "releasetools: Generate streamable A/B OTA packages."
This reverts commit ef1bb4360f.

It has broken the builds that don't have care_map.txt entry.

Change-Id: I343455e66be5e79457968dfc2813c7c1c234b6dc
2017-01-25 01:41:13 +00:00
Tao Bao 56677596ff Merge "releasetools: Generate streamable A/B OTA packages." am: 41130f495f am: 62bc5301ec
am: ac5a36e56b

Change-Id: I4589d78f4adc7ae9af3a77407cfee8a4f4b9c4e6
2017-01-25 00:02:52 +00:00
Tao Bao ac5a36e56b Merge "releasetools: Generate streamable A/B OTA packages." am: 41130f495f
am: 62bc5301ec

Change-Id: I6b70d99f0e3d944852938a4e7fdcf34dcde06e07
2017-01-25 00:00:54 +00:00
Tao Bao 62bc5301ec Merge "releasetools: Generate streamable A/B OTA packages."
am: 41130f495f

Change-Id: I33e4eb9cc536c7d49535a4c393a6b3303add9742
2017-01-24 23:59:24 +00:00
Tao Bao 41130f495f Merge "releasetools: Generate streamable A/B OTA packages." 2017-01-24 23:55:53 +00:00
Hiroshi Yamauchi d1a5cf176f Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am: 131731fd49 am: 7254e730a9
am: 0e2a7399da

Change-Id: I02955c2b729673771844f3e1c3b7099e7eb50d7b
2017-01-24 22:24:23 +00:00
Calin Juravle e674f92620 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am: eddf3adec7 am: 9be4363048
am: 79ff8975b6

Change-Id: I18428fe7cfb49a70dcf55b77dd0d92d839acdf01
2017-01-24 22:23:32 +00:00
Hiroshi Yamauchi 0e2a7399da Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am: 131731fd49
am: 7254e730a9

Change-Id: If496e17ca32097e2b5c5d1b16097ba68f52c2587
2017-01-24 22:22:08 +00:00
Calin Juravle 79ff8975b6 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am: eddf3adec7
am: 9be4363048

Change-Id: I09bb657dfa3a3d5ca5a2410313ee061235f56c74
2017-01-24 22:21:28 +00:00
Hiroshi Yamauchi 7254e730a9 Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default."
am: 131731fd49

Change-Id: I434953132243db254adf8513240e33257b917b21
2017-01-24 22:20:19 +00:00
Calin Juravle 9be4363048 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES"
am: eddf3adec7

Change-Id: I3405653797259f6529e1fd4e10434a435a3365fd
2017-01-24 22:19:32 +00:00
Hiroshi Yamauchi 131731fd49 Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." 2017-01-24 22:14:43 +00:00
Calin Juravle eddf3adec7 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" 2017-01-24 22:14:11 +00:00
Evgenii Stepanov 999ea7f160 Merge "Force Thumb for CFI targets." am: 34eb9f7f60 am: 9e8e3de9d8
am: 682a87a7f5

Change-Id: I9a586f57a8988bdb8d772705acef8f5f8b967e8d
2017-01-24 20:58:55 +00:00
Evgenii Stepanov d79d664dc9 Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." am: 96c81711c1 am: e729e804fe
am: 629002835a

Change-Id: Ia09b6fa057b4aada743d82ffcf5af87ab1b149f9
2017-01-24 20:58:41 +00:00
Evgenii Stepanov 682a87a7f5 Merge "Force Thumb for CFI targets." am: 34eb9f7f60
am: 9e8e3de9d8

Change-Id: I4f997927ff4357799afe8ca5d78255ea4e563beb
2017-01-24 20:56:54 +00:00
Evgenii Stepanov 629002835a Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." am: 96c81711c1
am: e729e804fe

Change-Id: I8a20ce05dffbf33b7c3480e13ee40cf0257dc06a
2017-01-24 20:56:41 +00:00
Evgenii Stepanov 9e8e3de9d8 Merge "Force Thumb for CFI targets."
am: 34eb9f7f60

Change-Id: Ie28255f6d8eb78ff5813623e167ad51ea1ab768b
2017-01-24 20:54:57 +00:00
Evgenii Stepanov e729e804fe Merge "Run $(AR) with LLVMgold.so plugin for CFI targets."
am: 96c81711c1

Change-Id: I914f2c1e037ad8988181801f7689636952beb5b2
2017-01-24 20:54:42 +00:00
Evgenii Stepanov 34eb9f7f60 Merge "Force Thumb for CFI targets." 2017-01-24 20:52:26 +00:00
Evgenii Stepanov 96c81711c1 Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." 2017-01-24 20:50:37 +00:00
Hiroshi Yamauchi bf6ad34962 Enable PRODUCT_ART_USE_READ_BARRIER by default.
Bug: 34084559
Bug: 34576638
Test: Boot gce_x86_phone on master
Change-Id: If284beb9551e55a4a698679399feb26e4acfd3d9
2017-01-24 11:15:32 -08:00
Evgenii Stepanov e1b96f3ae5 Run $(AR) with LLVMgold.so plugin for CFI targets.
Bug: 34623182
Test: add LOCAL_SANITIZE:=cfi to some static libraries under libstagefright
Change-Id: I4f0d8cbd794e0ce4737c59a4617e93c7a5defec1
2017-01-23 17:02:22 -08:00
Evgenii Stepanov 81bea1bd40 Force Thumb for CFI targets.
Bug: 22033465
Test: bionic device tests
Change-Id: I66eb83bc7153cc34dde4fa1abfa861182a10f1fa
2017-01-20 14:13:25 -08:00
Tao Bao ef1bb4360f releasetools: Generate streamable A/B OTA packages.
In order to support streaming A/B OTA packages, we pack
payload_properties.txt and care_map.txt in ZIP_STORED mode. These two
entries along with payload.bin (already in ZIP_STORED prior to this CL)
can be fetched directly based on the offset and length info.

We write the offset and length info into the package metadata entry
(META-INF/com/android/metadata), which can be parsed by the OTA server.

payload_properties.txt and care_map.txt are usually less than 1-KiB. So
the change only incurs marginal size increase.

Bug: 33382114
Test: Generate an A/B OTA package. Verify the 'streaming-property-files'
      entry in the metadata file.

Change-Id: I04504e834eb36e18876c5f5a5a09289ee05c6f9a
2017-01-19 22:25:12 -08:00
Vishwath Mohan d458faeeac Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e
am: 7baefbc0d4

Change-Id: I4c3ec234d252abc64c1f35afc87c03fbaaeea7d2
2017-01-20 01:56:14 +00:00
Vishwath Mohan 5b30c115a4 Merge "Hide CFI behind a global flag." am: c0bf85a615 am: 1bd8984ace
am: 085a015abb

Change-Id: I4b5deed6eb0b3f3ad0cde1ea78f299f0e34db0c6
2017-01-20 01:56:08 +00:00
Vishwath Mohan 7baefbc0d4 Merge "Hide CFI behind a global flag." am: 2d7fb30207
am: 3ca34aeb7e

Change-Id: Ibbc53641416c7493a68bed50e3aea13afd3e1f2f
2017-01-20 01:50:44 +00:00
Vishwath Mohan 085a015abb Merge "Hide CFI behind a global flag." am: c0bf85a615
am: 1bd8984ace

Change-Id: I8e1898c9bc087f66a2e1ed5a45c37a2340f419ad
2017-01-20 01:50:38 +00:00
Vishwath Mohan 3ca34aeb7e Merge "Hide CFI behind a global flag."
am: 2d7fb30207

Change-Id: I40127230f3016e91d9c1010b0cfb9d95b95fa05f
2017-01-20 01:45:43 +00:00
Vishwath Mohan 1bd8984ace Merge "Hide CFI behind a global flag."
am: c0bf85a615

Change-Id: I232a6a5d94ba28a965ba6d69e2dfdbdb66a2eeb8
2017-01-20 01:45:37 +00:00
Vishwath Mohan 2d7fb30207 Merge "Hide CFI behind a global flag." 2017-01-20 01:32:44 +00:00
Vishwath Mohan c0bf85a615 Merge "Hide CFI behind a global flag." 2017-01-20 01:32:44 +00:00
Dan Willemsen 9a5562312c Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a am: 4f87826d23
am: b7303cde95

Change-Id: Ie91d984c97c6da2cf99f7e838c14a50d6e6dbd1c
2017-01-20 01:20:08 +00:00
Dan Willemsen b7303cde95 Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a
am: 4f87826d23

Change-Id: I918859e58ab5d753e8a9cc83fc8f2eab940acbb9
2017-01-20 01:14:05 +00:00
Dan Willemsen 4f87826d23 Merge "Support native test prebuilts for X86+ARM builds"
am: bf28f5933a

Change-Id: I393d50f0452534c40f76fd83703bc7ae443d8a98
2017-01-20 01:09:34 +00:00
Treehugger Robot bf28f5933a Merge "Support native test prebuilts for X86+ARM builds" 2017-01-20 00:59:42 +00:00
Vishwath Mohan a5ff3e4133 Hide CFI behind a global flag.
This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.

Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Id026302e7f714b90a9e2c996f7a9314f534f90c2
2017-01-19 14:35:31 -08:00
Colin Cross 239c78a5b3 Merge "Don't pass empty arguments to ninja" am: f8acdc50fa am: d4aba70550
am: ac15f41714

Change-Id: I7e3ccee98fa04fbb8887d5dacd8f13e8341d6c05
2017-01-19 06:53:52 +00:00
Colin Cross ac15f41714 Merge "Don't pass empty arguments to ninja" am: f8acdc50fa
am: d4aba70550

Change-Id: I97206e4ec7baad1679f3a5b325a920ab7f8863c0
2017-01-19 06:51:21 +00:00
Colin Cross d4aba70550 Merge "Don't pass empty arguments to ninja"
am: f8acdc50fa

Change-Id: Ic9de7ca0f8269de190570554348053c4f7976195
2017-01-19 06:48:21 +00:00