Commit Graph

12190 Commits

Author SHA1 Message Date
Chih-Hung Hsieh
904ed93daf Merge "Put back LLVM_PREBUILTS_BASE." am: c921add339 am: 3dadeece2a am: 9d581bbcdb
am: 478210f500

Change-Id: I90c78974817f5452815989ef584d30d83e17af49
2017-01-26 20:31:50 +00:00
Chih-Hung Hsieh
478210f500 Merge "Put back LLVM_PREBUILTS_BASE." am: c921add339 am: 3dadeece2a
am: 9d581bbcdb

Change-Id: I4eaa1d0c11b1e4659405c022e460d042090c89ac
2017-01-26 20:29:16 +00:00
Chih-Hung Hsieh
9d581bbcdb Merge "Put back LLVM_PREBUILTS_BASE." am: c921add339
am: 3dadeece2a

Change-Id: I1da666f886eb051ddedde1d5db8823ffd58ee8a2
2017-01-26 20:26:45 +00:00
Chih-Hung Hsieh
614b3a52ea Put back LLVM_PREBUILTS_BASE.
Without this, WITH_TIDY is disabled because
PATH_TO_CLANG_TIDY uses LLVM_PREBUILTS_BASE.

Test: build with WITH_TIDY=1
Change-Id: I607ae45550f4574b3cee8e91c3d5b7eaa5f0a96c
2017-01-26 10:23:54 -08:00
Tao Bao
b27135b236 Makefile: Pack libsparse-host.so into otatools.zip. am: 04c8a03c85 am: 3258ac18c9
am: 0d7ffe6c5e

Change-Id: Ibffb9f9810e9ba2c24b4d0fe6fe9f5039a391bb8
2017-01-26 16:41:04 +00:00
Tao Bao
0d7ffe6c5e Makefile: Pack libsparse-host.so into otatools.zip. am: 04c8a03c85
am: 3258ac18c9

Change-Id: Ib8e513ad7ff9de309294b79fceef3cf28ae64b56
2017-01-26 16:38:04 +00:00
Tao Bao
138986b384 Makefile: Pack libsparse-host.so into otatools.zip.
delta_generator has a dependency on that.

Bug: 34731113
Bug: 34723547
Test: m otatools-package
Change-Id: I70752a8c283bf98cb6106d3999515d0fd01f43b2
(cherry picked from commit 04c8a03c85)
2017-01-26 08:28:57 -08:00
Tao Bao
04c8a03c85 Makefile: Pack libsparse-host.so into otatools.zip.
delta_generator has a dependency on that.

Bug: 34731113
Bug: 34723547
Test: m otatools-package
Change-Id: I70752a8c283bf98cb6106d3999515d0fd01f43b2
2017-01-26 16:27:18 +00:00
Brian Carlstrom
df2e417b93 Merge "Revert "Switch to clang-3625443."" am: 4932b9fb59 am: a7a3e4719d am: 52005b072d
am: a439927293

Change-Id: I5a68d9558e7144cf70387963b480eb876ceec5ac
2017-01-26 08:19:14 +00:00
Brian Carlstrom
a439927293 Merge "Revert "Switch to clang-3625443."" am: 4932b9fb59 am: a7a3e4719d
am: 52005b072d

Change-Id: I802fb68f3f1666fcecc53e2134adfeac0fa0230f
2017-01-26 08:16:09 +00:00
Brian Carlstrom
52005b072d Merge "Revert "Switch to clang-3625443."" am: 4932b9fb59
am: a7a3e4719d

Change-Id: I880c175120c5d39abb93196c890ed0068fc2b50d
2017-01-26 08:13:10 +00:00
Brian Carlstrom
4932b9fb59 Merge "Revert "Switch to clang-3625443."" 2017-01-26 08:05:36 +00:00
Stephen Hines
0425d52cde Revert "Switch to clang-3625443."
This reverts commit 296af27303.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I524c2c89004c79352bf2be3727c7ddcceca9b2e7
2017-01-26 07:59:53 +00:00
Stephen Hines
3c8f892128 Merge "Switch to clang-3625443." am: 296c345be9 am: 7c88a2f902 am: 2b711fb78f
am: 0d0d2ee04a

Change-Id: I243ec2266123da5c7d46f51c0608789740430cbb
2017-01-26 07:35:29 +00:00
Stephen Hines
0d0d2ee04a Merge "Switch to clang-3625443." am: 296c345be9 am: 7c88a2f902
am: 2b711fb78f

Change-Id: I644f40bab1287a9f8b0a34fb3596a120cc31e61d
2017-01-26 07:30:07 +00:00
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
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
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
TreeHugger Robot
828b1cf285 Merge "Prevent abuse of property overrides" 2017-01-25 01:43:01 +00:00
Hiroshi Yamauchi
80eeb8634d Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am: 131731fd49 am: 7254e730a9 am: 0e2a7399da
am: d1a5cf176f

Change-Id: Id062e9704ee3be622089e6a36908509a5f883687
2017-01-24 22:27:44 +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
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
b6f056c41b Merge "Force Thumb for CFI targets." am: 34eb9f7f60 am: 9e8e3de9d8 am: 682a87a7f5
am: 999ea7f160

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

Change-Id: Ia2d4f0a4748f3e7964d384e58c386c8678f810c4
2017-01-24 21:00:40 +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
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
Jaekyun Seok
294286d95c 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
2017-01-24 17:55:31 +09: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
a0bac3fb5f Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e am: 7baefbc0d4
am: d458faeeac

Change-Id: I297ab011fb901d6069672d034e2d8b8483ca21cb
2017-01-20 02:06:16 +00:00
Vishwath Mohan
9abc47d24f Merge "Hide CFI behind a global flag." am: c0bf85a615 am: 1bd8984ace am: 085a015abb
am: 5b30c115a4

Change-Id: I1d854bb525be09926890da631ecfe77a7fb3413c
2017-01-20 02:06:09 +00: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
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
96d0c1fd47 Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a am: 4f87826d23 am: b7303cde95
am: 9a5562312c

Change-Id: Ib8eb51136c7755eb52e9f015b4798566ddd6f3e3
2017-01-20 01:30:28 +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
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