Nicolas Geoffray
7c1b5d08d4
Merge "Revert "Make privileged apps always keep uncompressed dex files."" am: bb779a0c04
...
am: ed7dab7625
2017-09-18 15:22:31 +00:00
Nicolas Geoffray
ed7dab7625
Merge "Revert "Make privileged apps always keep uncompressed dex files.""
...
am: bb779a0c04
2017-09-18 15:20:00 +00:00
Nicolas Geoffray
bb779a0c04
Merge "Revert "Make privileged apps always keep uncompressed dex files.""
2017-09-18 15:11:09 +00:00
Nicolas Geoffray
f69441b76b
Revert "Make privileged apps always keep uncompressed dex files."
...
Broke Fugu build. Will work on a workaround for it.
bug: 30972906
bug: 63920015
This reverts commit 09dfe6739a
2017-09-18 15:07:26 +00:00
Nicolas Geoffray
4ad5bbb35d
Merge "Make privileged apps always keep uncompressed dex files." am: 3a5c65ef2f
...
am: 65c8bc6695
2017-09-18 09:28:39 +00:00
Nicolas Geoffray
65c8bc6695
Merge "Make privileged apps always keep uncompressed dex files."
...
am: 3a5c65ef2f
2017-09-18 09:26:09 +00:00
Nicolas Geoffray
3a5c65ef2f
Merge "Make privileged apps always keep uncompressed dex files."
2017-09-18 09:21:53 +00:00
Nicolas Geoffray
09dfe6739a
Make privileged apps always keep uncompressed dex files.
...
To ensure the verified boot work does not make ART run
dex code uncompressed in memory, make the build system
generate uncompressed dex files in APKs.
The alignment of STORE files in an APK is already handled.
bug: 30972906
bug: 63920015
Test: doing zipinfo on the produced apks after build.
Change-Id: I0ccdeae5d674b2a409a1343c4a14699c7bf0defb
2017-09-15 21:49:05 +01:00
Nan Zhang
46010dda39
Merge "Move classes.jar generation right below JarJar phase." am: 729a221a16
...
am: 32fc9a5c46
2017-09-15 20:18:20 +00:00
Nan Zhang
32fc9a5c46
Merge "Move classes.jar generation right below JarJar phase."
...
am: 729a221a16
2017-09-15 20:13:18 +00:00
Jeff Gaston
593caca87d
resolve merge conflicts of 8bbbd87ef6 to stage-aosp-master
...
am: c5fa0e7f49
2017-09-15 20:12:54 +00:00
Jeff Gaston
c5fa0e7f49
resolve merge conflicts of 8bbbd87ef6 to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Id2d18fe41de5d533baf1f082292d70d946386249
Change-Id: Ibc66733eb7879f2be2458e922641fec3a899beab
2017-09-15 19:25:19 +00:00
Treehugger Robot
729a221a16
Merge "Move classes.jar generation right below JarJar phase."
2017-09-15 17:53:23 +00:00
Tao Bao
14532296a2
Merge "Consider prebuilt vendor.img as having vendor partition." into oc-dr1-dev
...
am: 0bf9b22866
2017-09-15 13:46:25 +00:00
TreeHugger Robot
0bf9b22866
Merge "Consider prebuilt vendor.img as having vendor partition." into oc-dr1-dev
2017-09-15 13:42:18 +00:00
Nan Zhang
870025f89b
Move classes.jar generation right below JarJar phase.
...
By doing this, we don't need run desugar/Jacoco/proguard twice for
static java libraries(one for their self build, another for downstream
dependents).
Test: m clean && m java
Bug: b/65455145
Change-Id: I87aee34940937dbde33a977f55d1faf2c8054561
2017-09-14 14:44:40 -07:00
Jeff Gaston
8bbbd87ef6
Merge "Fix sdk-addon for absolute OUT_DIR"
2017-09-14 01:51:02 +00:00
Tao Bao
e45026effa
Merge "Consider prebuilt vendor.img as having vendor partition." am: 8a7b0dee6b
...
am: 4a5a1e15a1
2017-09-14 00:43:53 +00:00
Tao Bao
4a5a1e15a1
Merge "Consider prebuilt vendor.img as having vendor partition."
...
am: 8a7b0dee6b
2017-09-14 00:25:48 +00:00
Adam Seaton
ac9cd77574
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours am: e9263f666f
...
am: eada8fa3e3
2017-09-13 22:50:43 +00:00
Adam Seaton
b1579af4fb
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours am: 26bba7b920
...
am: 54f1f70971
2017-09-13 22:49:34 +00:00
Adam Seaton
eada8fa3e3
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours
...
am: e9263f666f
2017-09-13 22:25:08 +00:00
Adam Seaton
54f1f70971
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours
...
am: 26bba7b920
2017-09-13 22:24:25 +00:00
Jeff Gaston
43f3457329
Fix sdk-addon for absolute OUT_DIR
...
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.jeffrygaston-linux-x86.zip
Change-Id: Id2d18fe41de5d533baf1f082292d70d946386249
2017-09-13 15:23:38 -07:00
Tao Bao
8a7b0dee6b
Merge "Consider prebuilt vendor.img as having vendor partition."
2017-09-13 22:10:43 +00:00
Adam Seaton
e9263f666f
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd
...
am: dd45809495
2017-09-13 22:01:01 +00:00
Adam Seaton
26bba7b920
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda
...
am: 6b626cb4c6
2017-09-13 22:00:29 +00:00
Tao Bao
2a2dbcd4b5
Consider prebuilt vendor.img as having vendor partition.
...
vendor.img could be built from the source - in which case we have
unpacked files under VENDOR/ - or dropped in as a prebuilt binary blob.
We should consider either of them as target having a vendor partition.
Because we need to add its AVB hashtree info into vbmeta.img if target
is using AVB. Otherwise libfs_mgr would refuse to mount this
"AVB-enabled" vendor.img.
For targets not using AVB, this change is no-op.
Bug: 65462819
Test: Having vendor.img as prebuilt, `make dist`. Check that the
generated vbmeta.img contains the info from vendor.img.
Test: Build, flash and boot the above image.zip.
Change-Id: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
Merged-In: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
(cherry picked from commit b22afea0f0
2017-09-13 14:59:52 -07:00
Adam Seaton
db4b460d4b
Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
...
am: 6b7c615cb6
2017-09-13 21:56:15 +00:00
Adam Seaton
813eb5e81d
Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
...
am: 8e3eac06fb
2017-09-13 21:56:02 +00:00
Adam Seaton
dd45809495
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8
...
am: 0b0e0bc4cd
2017-09-13 21:40:05 +00:00
Adam Seaton
6b626cb4c6
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd
...
am: 86e0337fda
2017-09-13 21:39:22 +00:00
Adam Seaton
6b7c615cb6
Update Security String to 2017-11-05 on oc-dev bug:65631379
...
am: d24487a2f2
2017-09-13 21:30:22 +00:00
Adam Seaton
8e3eac06fb
Update Security String to 2017-11-01 on oc-dev bug:65631379
...
am: 8f4a4c2131
2017-09-13 21:29:44 +00:00
Steve Muckle
dff8364c97
Merge "get kernel configs from kernel/configs" am: b4a3124822
...
am: 634ab481da
2017-09-13 21:20:27 +00:00
Adam Seaton
0b0e0bc4cd
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770
...
am: a58425e0c8
2017-09-13 21:18:21 +00:00
Adam Seaton
86e0337fda
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8
...
am: 8d7c08cafd
2017-09-13 21:16:26 +00:00
Steve Muckle
634ab481da
Merge "get kernel configs from kernel/configs"
...
am: b4a3124822
2017-09-13 21:08:28 +00:00
Adam Seaton
a58425e0c8
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2
...
am: 59bbe44770
2017-09-13 20:50:38 +00:00
Adam Seaton
8d7c08cafd
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615
...
am: cbe21a52c8
2017-09-13 20:48:56 +00:00
Tao Bao
b67fd59f14
Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev
...
am: 2998812706
2017-09-13 20:20:47 +00:00
Adam Seaton
59bbe44770
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours
...
am: a991b6acc2
2017-09-13 20:13:41 +00:00
Adam Seaton
cbe21a52c8
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379
...
am: 6f224a7615
2017-09-13 20:12:59 +00:00
Adam Seaton
a991b6acc2
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be
...
am: 33e8f674d7
2017-09-13 19:48:49 +00:00
Adam Seaton
33e8f674d7
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4
...
am: b691e678be
2017-09-13 19:38:15 +00:00
Steve Muckle
b4a3124822
Merge "get kernel configs from kernel/configs"
2017-09-13 19:33:19 +00:00
Adam Seaton
b691e678be
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64
...
am: 0bae3f0fa4
2017-09-13 19:33:16 +00:00
Adam Seaton
0bae3f0fa4
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379
...
am: 0c93452c64
2017-09-13 19:30:45 +00:00
Tao Bao
b22afea0f0
Consider prebuilt vendor.img as having vendor partition.
...
vendor.img could be built from the source - in which case we have
unpacked files under VENDOR/ - or dropped in as a prebuilt binary blob.
We should consider either of them as target having a vendor partition.
Because we need to add its AVB hashtree info into vbmeta.img if target
is using AVB. Otherwise libfs_mgr would refuse to mount this
"AVB-enabled" vendor.img.
For targets not using AVB, this change is no-op.
Bug: 65462819
Test: Having vendor.img as prebuilt, `make dist`. Check that the
generated vbmeta.img contains the info from vendor.img.
Test: Build, flash and boot the above image.zip.
Change-Id: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
2017-09-13 11:05:15 -07:00
Adam Seaton
d24487a2f2
Update Security String to 2017-11-05 on oc-dev bug:65631379
2017-09-13 10:51:18 -07:00
