Commit Graph

32290 Commits

Author SHA1 Message Date
Adam Seaton
1ebc73f23f Update comments around PLATFORM_SECURITY_LEVEL
am: 65994c1d13

Change-Id: I800ffe93f311d9871c525f537cb92c525ac51510
2016-08-25 23:30:29 +00:00
Adam Seaton
65994c1d13 Update comments around PLATFORM_SECURITY_LEVEL
Bug: 29881091
Change-Id: I7f036f2602a4296bd0f9118fd2aeba9828f03710
2016-08-25 15:30:21 -07:00
Adam Seaton
f45494279a Update comments around PLATFORM_SECURITY_LEVEL
Bug: 29881091
Change-Id: Ib30aac55540513e43af147914f4470a78f368ef6
2016-08-25 15:24:56 -07:00
Colin Cross
76c4533899 Export TARGET_PREFER_32_BIT_EXECUTABLES to soong
Change-Id: I1427d88c7539c5ed0c4c238bad4a28f73d29ef0f
2016-08-25 14:49:17 -07:00
Colin Cross
90b18af80d Merge "Install symlinks when using shortcut phony targets" am: 6f1cf129f2 am: f9ed0fffe4 am: 7d26f58c09
am: 118f909d21

Change-Id: I8365a16f274644b38cb4352249376fc84a03670e
2016-08-25 21:18:42 +00:00
Colin Cross
118f909d21 Merge "Install symlinks when using shortcut phony targets" am: 6f1cf129f2 am: f9ed0fffe4
am: 7d26f58c09

Change-Id: I0b2c5683a90ee2a473d5ae5d5c32b902e087f5fc
2016-08-25 20:52:16 +00:00
Colin Cross
7d26f58c09 Merge "Install symlinks when using shortcut phony targets" am: 6f1cf129f2
am: f9ed0fffe4

Change-Id: Idfc6453e8581b58fbc584f2a7c5d0fd8b605b805
2016-08-25 20:49:45 +00:00
Colin Cross
f9ed0fffe4 Merge "Install symlinks when using shortcut phony targets"
am: 6f1cf129f2

Change-Id: I73386358b3b74ed71f0e3640eb06b74eb923fb5a
2016-08-25 20:47:19 +00:00
Colin Cross
6f1cf129f2 Merge "Install symlinks when using shortcut phony targets" 2016-08-25 20:39:31 +00:00
Chih-hung Hsieh
08a4f17004 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker." am: a9ee94f441 am: 5c2ca39c58 am: 920f36ad97
am: 385c2af183

Change-Id: I494a02910f420d099ecdd9ddd87ac87629399dcf
2016-08-25 02:46:22 +00:00
Chih-hung Hsieh
385c2af183 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker." am: a9ee94f441 am: 5c2ca39c58
am: 920f36ad97

Change-Id: I78ee24eda973aa9b5290cdfbf62c6cc4faa174c2
2016-08-25 02:40:28 +00:00
Chih-hung Hsieh
920f36ad97 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker." am: a9ee94f441
am: 5c2ca39c58

Change-Id: I99de763757298270f6ce4cc124cc6ead840ace02
2016-08-25 02:36:57 +00:00
Chih-hung Hsieh
5c2ca39c58 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker."
am: a9ee94f441

Change-Id: I9b3d7949d58fe6f6c80b7717c61e8efe8b5bc706
2016-08-25 02:33:59 +00:00
Chih-hung Hsieh
a9ee94f441 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker." 2016-08-25 02:24:32 +00:00
Tianjie Xu
3e8413a959 resolve merge conflicts of 8532aa4 to nyc-mr1-dev-plus-aosp
am: 94a41630ef

Change-Id: Idac23ca3a5d50f4426f40e9806f910eaf8aff913
2016-08-24 23:39:50 +00:00
Tianjie Xu
94a41630ef resolve merge conflicts of 8532aa4 to nyc-mr1-dev-plus-aosp
Change-Id: I104192d50552612d10e418791515a834266a8262
2016-08-24 16:28:23 -07:00
Colin Cross
6d34b61bd3 Install symlinks when using shortcut phony targets
Make symlinks an order-only dependency of the module name phony target
so that they get installed with make module or make MODULES-IN-path.

Test: mmma -j art/dalvikvm, remove symlink in $OUT and retry
Change-Id: Iae472a1c8fa1e8386cc9556cfe819bd4fca99428
2016-08-24 15:24:29 -07:00
Chih-hung Hsieh
dfecb7a13a Merge "Recognize new warning messages." am: b8f6f5dced am: 70a851d9c5 am: 4b62375ee1
am: 8514848ae2

Change-Id: I086d0ed31365ed52f700a5d047663c3cf9305867
2016-08-24 21:21:54 +00:00
Tianjie Xu
8532aa4c42 Merge "Don't regenerate userdata.img when signing" am: a7adc06e68
am: bdd89369d9

Change-Id: Ia22016998e26c0e1e4b8ae66c035a93a8df6a993
2016-08-24 21:18:30 +00:00
Tianjie Xu
bdd89369d9 Merge "Don't regenerate userdata.img when signing"
am: a7adc06e68

Change-Id: Ib6139262f366fa864e03d98796e5384fa12c7c55
2016-08-24 21:15:33 +00:00
Treehugger Robot
a7adc06e68 Merge "Don't regenerate userdata.img when signing" 2016-08-24 21:10:08 +00:00
Chih-hung Hsieh
8514848ae2 Merge "Recognize new warning messages." am: b8f6f5dced am: 70a851d9c5
am: 4b62375ee1

Change-Id: Icdd94c9a133c791b417e75790b512701557b3f8b
2016-08-24 21:06:00 +00:00
Chih-hung Hsieh
4b62375ee1 Merge "Recognize new warning messages." am: b8f6f5dced
am: 70a851d9c5

Change-Id: If13c32d6bd39bebd9534145b34a7af2d8175a70d
2016-08-24 21:02:59 +00:00
Chih-hung Hsieh
70a851d9c5 Merge "Recognize new warning messages."
am: b8f6f5dced

Change-Id: I1d3ee3bed661be31f03b76e5c2abfd3e56d18bff
2016-08-24 21:00:01 +00:00
Chih-hung Hsieh
b8f6f5dced Merge "Recognize new warning messages." 2016-08-24 20:56:36 +00:00
Chih-Hung Hsieh
01530a6ff2 Recognize new warning messages.
* Generalize regular expression to match new warning messages.
* Remove old unused pattern.

Change-Id: I54f2e5bdb255b290cb3751ba56558f5fe8d7245e
Test: Run warn.py with build.log
2016-08-24 20:53:27 +00:00
Alistair Strachan
6fde2b73c5 Merge "Avoid accidentally using the host's native 'as' command." into cw-f-dev am: 4e07040287
am: 163fba7c39

Change-Id: I3fb49929381f163c4e027e9c11f88b89bdcd5cea
2016-08-24 20:45:09 +00:00
Alistair Strachan
b9bbbe20a6 Avoid accidentally using the host's native 'as' command. am: 7390ef5553 -s ours
am: 94a3a03460

Change-Id: I250173d9a67dc83460bd4382769920949b8ff31a
2016-08-24 20:45:08 +00:00
Tianjie Xu
b48589af57 Don't regenerate userdata.img when signing
The userdata.img and cache.img entries are not useful in signed builds;
because fastboot doesn't look at these two entries in the *img.zip when
flashing a device. And they aren't used elsewhere. Therefore, skip
building the image files for them when signing the target files with
sign_target_files_apks. Also, add an option "--is_signing" to avoid
adding these two images when we call add_img_to_target_files.

Change-Id: I39ba91a86d9a856d7d01771f6d1403dbf21f2011
Test: Run sign_target_files_apks on a target file and userdata/cache.img doesn't not generate.
Bug: 30642470
2016-08-24 12:50:35 -07:00
Alistair Strachan
163fba7c39 Merge "Avoid accidentally using the host's native 'as' command." into cw-f-dev
am: 4e07040287

Change-Id: I6e71f55a7d3d7c51d3d50994f6588ab789aa553b
2016-08-24 19:31:17 +00:00
Alistair Strachan
94a3a03460 Avoid accidentally using the host's native 'as' command.
am: 7390ef5553  -s ours

Change-Id: I2d92a39668e208d748adfd969e2f08ee494dcd0d
2016-08-24 19:30:53 +00:00
TreeHugger Robot
4e07040287 Merge "Avoid accidentally using the host's native 'as' command." into cw-f-dev 2016-08-24 18:46:18 +00:00
Yohann Roussel
4253f35dbb Merge "Allow selection of prebuilts min sdk" am: 624619d4d0 am: 1d7e0f2c74 am: 51403950b3
am: 760ece009b

Change-Id: I74a694593cc3937a919346c4dc0923883c85beea
2016-08-24 10:04:44 +00:00
Yohann Roussel
760ece009b Merge "Allow selection of prebuilts min sdk" am: 624619d4d0 am: 1d7e0f2c74
am: 51403950b3

Change-Id: I59906380334fd96d70044b7d5253ea703ab08690
2016-08-24 09:54:54 +00:00
Yohann Roussel
51403950b3 Merge "Allow selection of prebuilts min sdk" am: 624619d4d0
am: 1d7e0f2c74

Change-Id: I54d5035cecbfa6785a68c9d454ffb27a5e8346cd
2016-08-24 09:52:28 +00:00
Yohann Roussel
1d7e0f2c74 Merge "Allow selection of prebuilts min sdk"
am: 624619d4d0

Change-Id: I54df2acb3003c0222b3f3d909d3f9c80dfda493d
2016-08-24 09:50:29 +00:00
Yohann Roussel
624619d4d0 Merge "Allow selection of prebuilts min sdk" 2016-08-24 09:39:30 +00:00
Chih-Hung Hsieh
b9ea8d191d Suppress clang-tidy checks in frameworks/compile/mclinker.
Too many warnings need to wait for upstream changes.
Test: build with WITH_TIDY=1.

Change-Id: I0b1272049ad757670182668db130512a538b3096
2016-08-23 11:07:19 -07:00
Alistair Strachan
7390ef5553 Avoid accidentally using the host's native 'as' command.
When invoking clang for the host to assemble .S files, the -B flag
would not be provided, which allowed the host prebuilt clang to
use an 'as' from the native environment. Most of the time this
"just works", but some newer 'as' versions cause problems with
the older prebuilt toolchain, for example by generating
unsupported relocation types.

To avoid this problem, simply use the -B flag to tell clang to
invoke the assembler from the correct prebuilt gcc prefix.

(cherry-picked from AOSP commit 5ff9c81b6c)

Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342
Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
2016-08-22 19:39:25 -07:00
Casey Dahlin
5d58dc276a Merge "List partition_table.bpt as an output of running bpttool" am: aba93cf736 am: 14aa63a52a am: 75db430a08
am: d1584a5d77

Change-Id: Ia7497f943aa68021d569e025472cffb6d2d85a2b
2016-08-23 01:10:55 +00:00
Casey Dahlin
d1584a5d77 Merge "List partition_table.bpt as an output of running bpttool" am: aba93cf736 am: 14aa63a52a
am: 75db430a08

Change-Id: I590c6ef761fcb75a16bc1b87f0274913206bbca1
2016-08-23 01:05:51 +00:00
Casey Dahlin
75db430a08 Merge "List partition_table.bpt as an output of running bpttool" am: aba93cf736
am: 14aa63a52a

Change-Id: If2ef06aa3c0b77506ccd7384577497d2a49456bc
2016-08-23 01:01:18 +00:00
Casey Dahlin
14aa63a52a Merge "List partition_table.bpt as an output of running bpttool"
am: aba93cf736

Change-Id: Ib986d3551a2bfff5ce813139380378b11dd84d82
2016-08-23 00:56:19 +00:00
Treehugger Robot
aba93cf736 Merge "List partition_table.bpt as an output of running bpttool" 2016-08-23 00:41:52 +00:00
Dirk Dougherty
a8bd773388 Merge "Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds." into nyc-dev am: 61ed44b678 am: e00a9ba3b5 am: 88a15e9889 am: 7b3142be87
am: 5903fabc7e

Change-Id: I45ffc773cc86f90d6a6a11b304baef5de2979b5e
2016-08-23 00:20:51 +00:00
Dirk Dougherty
b174588ea3 Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds. am: baa86c7bfe am: 6903dc6a4b am: eb101dabd2 am: 2556306329
am: 5105d6be63

Change-Id: I8613a946165ea89b68fe6b8358e60601a6e86d3f
2016-08-23 00:20:50 +00:00
Dirk Dougherty
5903fabc7e Merge "Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds." into nyc-dev am: 61ed44b678 am: e00a9ba3b5 am: 88a15e9889
am: 7b3142be87

Change-Id: I7b0e15f229db864f8db67cfa3564592fd8e3bd71
2016-08-23 00:15:12 +00:00
Dirk Dougherty
5105d6be63 Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds. am: baa86c7bfe am: 6903dc6a4b am: eb101dabd2
am: 2556306329

Change-Id: I7da2a5488a49022aa136cfd2774eefbb91fb94d7
2016-08-23 00:15:11 +00:00
Dirk Dougherty
7b3142be87 Merge "Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds." into nyc-dev am: 61ed44b678 am: e00a9ba3b5
am: 88a15e9889

Change-Id: I0df14fdfc0a6ccce214919d15561144b84518783
2016-08-23 00:08:39 +00:00
Dirk Dougherty
2556306329 Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds. am: baa86c7bfe am: 6903dc6a4b
am: eb101dabd2

Change-Id: I88a8de788fecb0853d01d5e4cb07d9003c555193
2016-08-23 00:08:39 +00:00