Commit Graph

11536 Commits

Author SHA1 Message Date
Stephen Hines
2b711fb78f Merge "Switch to clang-3625443." am: 296c345be9
am: 7c88a2f902

Change-Id: I8ad1085548ea629670d5b8e088752f2a1f953772
2017-01-26 07:25:05 +00:00
Treehugger Robot
296c345be9 Merge "Switch to clang-3625443." 2017-01-26 07:13:21 +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
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
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
Hiroshi Yamauchi
131731fd49 Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." 2017-01-24 22:14:43 +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
34eb9f7f60 Merge "Force Thumb for CFI targets." 2017-01-24 20:52:26 +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
Stephen Hines
296af27303 Switch to clang-3625443.
Bug: http://b/31532493
Test: Manual validation.
Change-Id: I0490b60c996052669fbfd545d7c3eed17fdd3547
2017-01-23 15:03:55 -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
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
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
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
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
Vishwath Mohan
8dcfdcebe9 Hide CFI behind a global flag.
This CL ensures that the LOCAL_SANITIZE=cfi is not honored unless it
is enabled globally using ENABLE_CFI='true' first. This allows CFI to
be hidden 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: If4508ba448bd4260020483f9c11ee849bb419713
2017-01-18 18:04:00 -08:00
Adam Seaton
72e3501bd4 Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91 am: 8e89e568b9
am: 8e90b1da24

Change-Id: Ie167252d0225afec37402e48f13ba039f76b9534
2017-01-17 23:18:46 +00:00
Adam Seaton
5ac65adf12 Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am: 54b11f5c49
am: 9bbbf746ec

Change-Id: I3e492558fd5271a1661ecac667971f790643b720
2017-01-17 23:18:41 +00:00
Adam Seaton
8e90b1da24 Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91
am: 8e89e568b9

Change-Id: Ia97740daf709d8c8d4bf992bf1acb8cd80fca8f4
2017-01-17 23:16:16 +00:00
Adam Seaton
9bbbf746ec Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57
am: 54b11f5c49

Change-Id: Iff9e2dfc5dc5f9ef260829ef3e86e834aae53b4a
2017-01-17 23:16:11 +00:00
Adam Seaton
8e89e568b9 Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba
am: cb8fef9d91

Change-Id: I57a8e17828c908dcdb588bb4df8e12eeeef45d27
2017-01-17 23:12:15 +00:00
Adam Seaton
54b11f5c49 Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03
am: cacce5db57

Change-Id: I090fcc6c3986a07e2a5c6cd49e82b42470ea8002
2017-01-17 23:12:10 +00:00
Adam Seaton
cb8fef9d91 Updating Security String to 2017-03-05 on nyc-dev
am: 25b39b12ba

Change-Id: I85a8100d821ed89b5c0ee4c347bb09b822c15d8d
2017-01-17 23:10:15 +00:00
Adam Seaton
cacce5db57 Updating Security String to 2017-03-01 on nyc-dev
am: 003e5aad03

Change-Id: I5a7cec00ddc99b9b8791e2e61d21d1936d3afc4c
2017-01-17 23:10:09 +00:00
Dan Willemsen
d79dde610e Support native test prebuilts for X86+ARM builds
This allows Soong native tests to be built and installed on these
builds.

Bug: 32177952
Test: m -j bionic-unit-tests
Change-Id: Ifbe39ba7a8991cb87d10c5da679992cf3065444e
2017-01-17 14:19:50 -08:00
Connor O'Brien
11fe8f5611 Merge "Pass flash erase & logical block size to mke2fs" am: cf4f7eac85
am: 80daf82c0b

Change-Id: I839d2bfc446ce327af12f12596ba8836be108ac7
2017-01-17 20:16:34 +00:00
Adam Seaton
25b39b12ba Updating Security String to 2017-03-05 on nyc-dev
b/34345751

Change-Id: Ieaaccd7b92c85bb3389fab5e03011892bf7fdcba
2017-01-17 11:37:18 -08:00
Adam Seaton
003e5aad03 Updating Security String to 2017-03-01 on nyc-dev
b/34345751

Change-Id: I55d9ba3f16264f9e4f9ad72e861527a3f8ae566c
2017-01-17 11:36:19 -08:00
Connor O'Brien
20f08c3e16 Pass flash erase & logical block size to mke2fs
This information can be used to tune ext4 stripe and stride in the
userdata partition for better performance

Test: Build & flash userdata, confirm correct stripe & stride values
Bug: 33243520
Merged-In: Ia97cdd2d0239c3484b895fce49299f692ef911d8
Change-Id: Ia97cdd2d0239c3484b895fce49299f692ef911d8
Signed-off-by: Connor O'Brien <connoro@google.com>
2017-01-13 12:17:05 -08:00
Joachim Sauer
95874afdfb Merge "Add java.time packages to whitelist." am: 4dbe67cddc
am: 4f60acde39

Change-Id: I792adfb7df7dba66236c15956c899a5b36a61a2f
2017-01-13 10:33:56 +00:00
Joachim Sauer
4dbe67cddc Merge "Add java.time packages to whitelist." 2017-01-13 10:18:20 +00:00
Jack He
258cf95456 Merge "Add mk file parsers to support build variables required by system/bt" am: 7b66d28b25
am: dfa69daccc

Change-Id: Ie7e81cfe290214734db6c09c42f4aba8d2cd2be8
2017-01-12 08:46:13 +00:00
Treehugger Robot
7b66d28b25 Merge "Add mk file parsers to support build variables required by system/bt" 2017-01-12 08:31:26 +00:00
Jack He
da214cd572 Add mk file parsers to support build variables required by system/bt
* BtConfigIncludeDir: Path to device specific config headers
                      BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR
* BTHcilpIncluded: Path to Hcilp headers
                   BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED
* BtHciUseMct: Whether MCT is used
               BLUETOOTH_HCI_USE_MCT

Bug: 32958753
Test: Code compilation, no user visible effects

Change-Id: I94cad65c77464e5b467abee05951ddfd35b9f27d
2017-01-11 17:11:32 -08:00
Colin Cross
3432bf504c Merge "Don't run find on directories that don't exist" am: c1df498f0c
am: a8839ac623

Change-Id: Ia8043ec41fd4589a300aa2780e775d003e0f2d0a
2017-01-11 23:59:39 +00:00
Treehugger Robot
c1df498f0c Merge "Don't run find on directories that don't exist" 2017-01-11 23:42:41 +00:00
Colin Cross
efb30be703 Don't run find on directories that don't exist
$(shell find vendor) causes a warning in AOSP where vendor doesn't
exist.

Test: m -j, no warning
Change-Id: I28916594e0720c53823a3d9ed99b8af1d356af23
2017-01-11 23:31:46 +00:00
Joachim Sauer
66d05aebd6 Add java.time packages to whitelist.
Bug: 28832222
Test: builds
Change-Id: I5a77f519f51eca93c34e4697b92a92bf72f4eda9
2017-01-11 12:48:33 +00:00
Jean-Luc Brouillet
235123a821 Merge "Move rs/scriptc to rs/script_api/include." am: a3ab4cc9c9
am: d9bfeff242

Change-Id: I0249452861ffd748200c02434674832a2303b20b
2017-01-11 02:17:59 +00:00
Jean-Luc Brouillet
a3ab4cc9c9 Merge "Move rs/scriptc to rs/script_api/include." 2017-01-11 02:04:16 +00:00
Tao Bao
f2305870f0 Makefile: Pack e2fsdroid into otatools.zip. am: bcc3109262
am: 8c07d3c840

Change-Id: I618f192b092feef99f430b65a4463c925e382d1b
2017-01-09 19:32:30 +00:00
Jean-Luc Brouillet
eba449391e Move rs/scriptc to rs/script_api/include.
Test: Compiled ImageProcessing_jb

Change-Id: Icf05a603671499665d2f31a8989fa69585a6f834
2017-01-08 17:57:48 -08:00
Tao Bao
bcc3109262 Makefile: Pack e2fsdroid into otatools.zip.
e2fsdroid is needed to create ext4 images with mke2fs. Also pack both
sets of mke2fs and make_ext4fs tools into otatools.zip. Because we use
the latest otatools.zip to create OTAs, which needs to handle
target_files.zip using either of them.

Bug: 34126605
Test: `m otatools-package` and check it has e2fsdroid and make_ext4fs.
Test: Use otatools.zip to sign a TF.zip that defines
      TARGET_USES_MKE2FS={true,false}.

Change-Id: I9967e4f078cbe912914c6c511681cba82356ae8e
2017-01-06 14:32:51 -08:00
Dan Willemsen
cb43c0f8db Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am: 81648927fb
am: ce324c6848

Change-Id: I1260ea1bba7de40cb0f9a3661f281406f48cd708
2017-01-05 22:51:44 +00:00
Dan Willemsen
81648927fb Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" 2017-01-05 22:42:07 +00:00