Commit graph

37228 commits

Author SHA1 Message Date
Nicolas Geoffray
bd0518ab55 Merge "Don't preopt system server apps in system_other."
am: f53ebefae3

Change-Id: I09f7b0e690871271349073edab59250721eb88e0
2017-04-28 11:50:28 +00:00
Nicolas Geoffray
66b4b297b1 Merge "Introduce a whitelist for core apps used by system server." am: 679727afeb am: 3293557187 am: 2a678b0f02 -s ours
am: 0581d8f12d

Change-Id: Ide0b0351ad3d1dafbb77a35570650deeda517d6d
2017-04-28 11:50:28 +00:00
Nicolas Geoffray
24f54693f9 Make the default preopt 'interpret-only'.
bug:33799337
bug:36534079

Test: m -j32 bullhead/angler/marlin/sailfish

(cherry picked from commit e0848c8b7f)

Change-Id: I6d71bdca1d7b7afab8150a0b19a0e2235832d5e0
2017-04-28 12:46:34 +01:00
Nicolas Geoffray
0581d8f12d Merge "Introduce a whitelist for core apps used by system server." am: 679727afeb am: 3293557187
am: 2a678b0f02  -s ours

Change-Id: I1ffd7a84eb0e5be9259538042c0680b54ab7c29a
2017-04-28 11:45:31 +00:00
Nicolas Geoffray
f53ebefae3 Merge "Don't preopt system server apps in system_other." 2017-04-28 11:45:15 +00:00
Nicolas Geoffray
2a678b0f02 Merge "Introduce a whitelist for core apps used by system server." am: 679727afeb
am: 3293557187

Change-Id: Iba143d70f5900d9ae6e4fb8205fc3a538e4a8283
2017-04-28 11:40:58 +00:00
Nicolas Geoffray
3293557187 Merge "Introduce a whitelist for core apps used by system server."
am: 679727afeb

Change-Id: I631f5c67a09d5dc466f6200392ca3528589e16ad
2017-04-28 11:38:29 +00:00
Nicolas Geoffray
cdd4343bb2 Don't preopt system server apps in system_other.
bug:36532541
bug:33799337

Test: m -j32 && find out/target -name \*.odex

(cherry picked from commit a2c6c0b11e)

Change-Id: Ic4396bb6c543af1c05f56030495caafb245ea304
2017-04-28 12:34:53 +01:00
Nicolas Geoffray
679727afeb Merge "Introduce a whitelist for core apps used by system server." 2017-04-28 11:32:52 +00:00
Nicolas Geoffray
b08ada1daa Introduce a whitelist for core apps used by system server.
And by default 'speed' compile those apps at build time.

bug:33799337
Test: m -j32

(cherry picked from commit 9af483488a)

Change-Id: I66f1c675369fccc03b6529c08cb030264d15ba1c
2017-04-28 10:38:41 +01:00
Jaekyun Seok
3b7560bf88 Split vendor license notices into vendor partition
Xml files will be generated instead of html files, and then Settings
will generate html file on runtime from xml files of partitions.

Test: build succeeded and tested on sailfish
Bug: 37099941
Change-Id: Id7899381a537b1947cbb6164ed2b4a98492334af
2017-04-28 16:29:17 +09:00
Yueyao Zhu
5c53e1d19b Merge "Makefile: support build and avb signing of dtbo img" am: 1a752acc89 am: 143b2be93e am: 14fef78797
am: 28112f2bdd

Change-Id: Ic71ab3a77e065190078eb29c4f8693d603f5f20f
2017-04-28 02:39:08 +00:00
Yueyao Zhu
28112f2bdd Merge "Makefile: support build and avb signing of dtbo img" am: 1a752acc89 am: 143b2be93e
am: 14fef78797

Change-Id: If8c047e8377c090fd739fdbdc5e80204b74bb1ce
2017-04-28 02:17:50 +00:00
Yueyao Zhu
14fef78797 Merge "Makefile: support build and avb signing of dtbo img" am: 1a752acc89
am: 143b2be93e

Change-Id: I58b393610a9f5cf3a241b325b9ce5afa3ddac962
2017-04-28 02:14:49 +00:00
Yueyao Zhu
143b2be93e Merge "Makefile: support build and avb signing of dtbo img"
am: 1a752acc89

Change-Id: I9b3fbff10331e4cd01aa43d22641b60b0f2f4374
2017-04-28 02:12:18 +00:00
Treehugger Robot
1a752acc89 Merge "Makefile: support build and avb signing of dtbo img" 2017-04-28 02:03:43 +00:00
Chih-Hung Hsieh
a5af614d34 Merge "Get Android TOP from build.log file." am: 72a662a282 am: 5bc24ca63a am: a463931292
am: ee0ffb596b

Change-Id: I1e9d9a8ba8ded556bb09434b98a269a8ee4b4b02
2017-04-27 23:13:50 +00:00
Chih-Hung Hsieh
ee0ffb596b Merge "Get Android TOP from build.log file." am: 72a662a282 am: 5bc24ca63a
am: a463931292

Change-Id: Ibd67280ffe97bf5ab3ea988f862331a145681da5
2017-04-27 23:00:21 +00:00
Chih-Hung Hsieh
a463931292 Merge "Get Android TOP from build.log file." am: 72a662a282
am: 5bc24ca63a

Change-Id: I5712b3d21d8ce5447883b0c70e0352794de8f4a2
2017-04-27 22:52:35 +00:00
Chih-Hung Hsieh
5bc24ca63a Merge "Get Android TOP from build.log file."
am: 72a662a282

Change-Id: I6308b936d3e9ac3d532bc3dac818a38dce03a61f
2017-04-27 22:51:05 +00:00
Treehugger Robot
72a662a282 Merge "Get Android TOP from build.log file." 2017-04-27 22:36:23 +00:00
Yueyao Zhu
211c90158c Makefile: support build and avb signing of dtbo img
Test: make with corresponding configurations in BoardConfig.mk
- dtbo.img is copied to the OUT directory
- avbtool info_image --image dtbo.img shows avb hashes
- avbtool info_image --image vbmeta.img shows dtbo partition info

Bug: 37730955
Change-Id: If3edaab860926c743f18fd031c911b076eb09fab
2017-04-27 14:49:39 -07:00
Chih-Hung Hsieh
ef21d1458b Get Android TOP from build.log file.
find_android_root works only when warn.py is found
so it works for build bot, but not when warn.py is
run against a stand alone build.log file.
Now get the TOP directory path from build.log
if it is found.

Bug: 37725427
Test: warn.py --gencsv build.log
Change-Id: I7b776c2e71a8d8d769f0600b08abe37acbd6ce7c
2017-04-27 10:25:37 -07:00
Joe LaPenna
08fd2b0ff0 Merge "Remove NetworkRecommendation from platform." into oc-dev am: e5181610d4
am: 0f35ca4165

Change-Id: I4cc4cf5cf6e247e1e071b1b2040c97b0f05366a0
2017-04-27 16:54:10 +00:00
Joe LaPenna
0f35ca4165 Merge "Remove NetworkRecommendation from platform." into oc-dev
am: e5181610d4

Change-Id: Ib86914507b37842863c122d83eebdddf69b8ae9c
2017-04-27 16:51:11 +00:00
Joe LaPenna
e5181610d4 Merge "Remove NetworkRecommendation from platform." into oc-dev 2017-04-27 16:45:15 +00:00
Tao Bao
9ce5064de2 Merge "Revert "Revert "Add compatibility metadata to OTA package""" am: f9937b5c24 am: 5e15d3cce1 am: 925147dd7d
am: b398d18f94

Change-Id: I537cebcb1992bce95a88d09f03926d75bfbf2ce1
2017-04-27 16:30:06 +00:00
Tao Bao
b398d18f94 Merge "Revert "Revert "Add compatibility metadata to OTA package""" am: f9937b5c24 am: 5e15d3cce1
am: 925147dd7d

Change-Id: If2f21fa653b05f14c3534090a98258c925006c81
2017-04-27 16:27:27 +00:00
Tao Bao
925147dd7d Merge "Revert "Revert "Add compatibility metadata to OTA package""" am: f9937b5c24
am: 5e15d3cce1

Change-Id: Icf50f5a83cc0dc5d0db413f6b4daea532bfbb9f8
2017-04-27 16:24:10 +00:00
Tao Bao
5e15d3cce1 Merge "Revert "Revert "Add compatibility metadata to OTA package"""
am: f9937b5c24

Change-Id: I1673c92ae8985e8ef681ea91a89ff237232be931
2017-04-27 16:21:40 +00:00
Tao Bao
f9937b5c24 Merge "Revert "Revert "Add compatibility metadata to OTA package""" 2017-04-27 16:12:57 +00:00
Mark Salyzyn
38f252c028 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" am: d0020fafe2 am: 151e856015 am: de12e39af7
am: c1b0993552

Change-Id: I77594a0b4485989f9132e5fdad24af636517105f
2017-04-27 15:54:36 +00:00
Mark Salyzyn
c1b0993552 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" am: d0020fafe2 am: 151e856015
am: de12e39af7

Change-Id: I4352677bec833b32c6c6a2acf86276d5fa7ed72a
2017-04-27 15:49:35 +00:00
Mark Salyzyn
de12e39af7 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" am: d0020fafe2
am: 151e856015

Change-Id: I6aae6d254471f48c1af0ce80c58ac890831c49fe
2017-04-27 15:44:38 +00:00
Mark Salyzyn
151e856015 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES"
am: d0020fafe2

Change-Id: I9af881f708c619e9da5b7b5204bbd58dd52d6195
2017-04-27 15:39:35 +00:00
Mark Salyzyn
d0020fafe2 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" 2017-04-27 15:33:29 +00:00
Mark Salyzyn
eb8dc72724 fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES
Misspelled fs_config_generate_extra_partition_list when used to
calculate LOCAL_REQUIRED_MODULES dependencies.  This resulted in
fs_config_dirs and fs_config_files failing to generate the vendor,
oem or odm variants (ie: fs_config_files_vendor)

Test: build generates correct fs_config override files.
Bug: 37721445
Bug: 36071012
Change-Id: I053dd5cdb357c7cea05a5ff63b0686bd0bc99df6
2017-04-27 08:01:27 -07:00
Nicolas Geoffray
dd448bbb29 resolve merge conflicts of 225fd8057f to oc-dev-plus-aosp
am: 2987311985

Change-Id: I54660014017d35528442e88ed12ca4960418f484
2017-04-27 12:56:53 +00:00
Nicolas Geoffray
2987311985 resolve merge conflicts of 225fd8057f to oc-dev-plus-aosp
Test: build

Change-Id: Iae46079ffda4ef5d6b1408044bfcb786ac08a7a6
2017-04-27 13:51:08 +01:00
Nicolas Geoffray
225fd8057f Merge "Update build files to new compiler filters." am: 6c8c20dd5b
am: 39568a6783

Change-Id: Ic31ecc16969b15f961f8126bade07a7daf42ec9d
2017-04-27 11:56:38 +00:00
Nicolas Geoffray
39568a6783 Merge "Update build files to new compiler filters."
am: 6c8c20dd5b

Change-Id: I01c7d2d2500d1d5c64cf8f1ed9d2901309ca9edd
2017-04-27 11:49:44 +00:00
Nicolas Geoffray
6c8c20dd5b Merge "Update build files to new compiler filters." 2017-04-27 11:40:07 +00:00
TreeHugger Robot
5dc34a23af Merge "slightly clarify error message from check_boot_jars.py" 2017-04-26 23:26:30 +00:00
Tao Bao
74dd53648f Merge "Revert "Revert "Add compatibility metadata to OTA package""" into oc-dev am: cc2bfa484e
am: 4bede622dc

Change-Id: Ia8c307d1e1299394cd6974ab5b48208193d5b39a
2017-04-26 21:37:22 +00:00
Tao Bao
4bede622dc Merge "Revert "Revert "Add compatibility metadata to OTA package""" into oc-dev
am: cc2bfa484e

Change-Id: Ief6654d9b1f6d4f355b792806b809e9378a32b4a
2017-04-26 21:30:53 +00:00
Tao Bao
21803d3574 Revert "Revert "Add compatibility metadata to OTA package""
This reverts commit b1e59b8a73.

This CL enables generating compatibility zip entry in an A/B OTA
package. We're not enabling the support for non-A/B OTAs for now until
they have the necessary support (e.g. /proc/config.gz exists).

Bug: 36810913
Test: Generate full and incremental packages for marlin and applly under
      normal boot and sideload respectively.

Change-Id: I69f0a3feb7a0efc7f727f92f31c9e63f47ee6530
(cherry picked from commit b63c952cc7)
2017-04-26 14:28:46 -07:00
Tao Bao
cc2bfa484e Merge "Revert "Revert "Add compatibility metadata to OTA package""" into oc-dev 2017-04-26 21:23:41 +00:00
Jeff Gaston
dd3a5b5503 slightly clarify error message from check_boot_jars.py
Bug: 36792868
Test: build/core/tasks/check_boot_jars/check_boot_jars.py build/core/tasks/check_boot_jars/package_whitelist.txt  out/target/common/obj/JAVA_LIBRARIES/core-oj_intermediates/classes.jar
Change-Id: I656b52fe97278a9d2f5e86678ec335e9c055ee15
2017-04-26 08:53:12 -07:00
Mark Salyzyn
f1e89f0df4 Merge changes I44289a3d,I0537453b,I23a655b1 am: 7928afb83d am: b6650076ad am: 6d63c8a7d5
am: 0934979502

Change-Id: I1b63f8f65f9aabe77278822f37570341933ae93a
2017-04-26 14:53:58 +00:00
Mark Salyzyn
0934979502 Merge changes I44289a3d,I0537453b,I23a655b1 am: 7928afb83d am: b6650076ad
am: 6d63c8a7d5

Change-Id: I2165562709fdebf98c90958299ed23079b41f080
2017-04-26 14:47:57 +00:00