Commit Graph

39695 Commits

Author SHA1 Message Date
Baligh Uddin
1f3d727474 Merge "Fix the detection for compressed APKs." into oc-mr1-dev
am: 8712ac10a7

Change-Id: If14f8a180693cc1df7348c871720c69649a59daf
2017-09-09 13:24:42 +00:00
Baligh Uddin
8712ac10a7 Merge "Fix the detection for compressed APKs." into oc-mr1-dev 2017-09-09 13:20:46 +00:00
Tao Bao
0f99033b71 Fix the detection for compressed APKs.
We pack _all_ the APK certs info into META/apkcerts.txt at build time,
including the ones that are not installed for the target. When
detecting for compressed APKs, we should only count the ones that are
actually installed.

Bug: 65498015
Test: `check_target_files_signatures.py bullhead-target_files.zip`
Change-Id: I2f32d4667be0efbfd5f9365dde819f009572533d
2017-09-08 19:46:01 -07:00
Jaekyun Seok
43a1aad136 Merge "Revert "Support TimeZoneRulesManagerService in GSI"" into oc-mr1-dev
am: 777d6a036b

Change-Id: I84437cb46261553754251f40b003fa55ad569bf1
2017-09-09 02:35:34 +00:00
TreeHugger Robot
777d6a036b Merge "Revert "Support TimeZoneRulesManagerService in GSI"" into oc-mr1-dev 2017-09-09 02:28:40 +00:00
Colin Cross
df6970b8f7 Merge "Make -ldl -lrt -lpthread implicit for host builds" am: 952f1e5161 am: ec6ba0d686
am: 380d3af42f

Change-Id: I3b2834eaa62156518a1e5997a88278280e20777a
2017-09-09 01:43:34 +00:00
Colin Cross
380d3af42f Merge "Make -ldl -lrt -lpthread implicit for host builds" am: 952f1e5161
am: ec6ba0d686

Change-Id: I2fe15e8e13e118a2c4a0c507158f8f847f1e250e
2017-09-09 01:40:17 +00:00
Colin Cross
ec6ba0d686 Merge "Make -ldl -lrt -lpthread implicit for host builds"
am: 952f1e5161

Change-Id: I4b540ee6dd2f9f858afc95d6ade27a6f9df1a05a
2017-09-09 01:36:02 +00:00
Treehugger Robot
952f1e5161 Merge "Make -ldl -lrt -lpthread implicit for host builds" 2017-09-09 01:32:23 +00:00
Dan Willemsen
29fca0148b Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" am: c9916ddbd7 am: e931e59dc6
am: bf9c5c393a

Change-Id: Id1df276d094a94a265561f43ad572b6ba08d7cbd
2017-09-08 23:56:35 +00:00
Dan Willemsen
bf9c5c393a Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" am: c9916ddbd7
am: e931e59dc6

Change-Id: Id53f310af8dcbab58e1e57959401879eb0897a79
2017-09-08 23:51:28 +00:00
Dan Willemsen
e931e59dc6 Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications"
am: c9916ddbd7

Change-Id: Ide09d043908f9289d9e487ed225b3823e8773b55
2017-09-08 23:48:14 +00:00
Colin Cross
0bd335f9b0 Make -ldl -lrt -lpthread implicit for host builds
Instead of requiring every host module to specify -ldl -lrt -lpthread
and then break the mac build because -lrt doesn't exist, make them
implicit to match the behavior of modules built for the device.

Test: m -j checkbuild
Change-Id: I7b5b5289a41cd8f6e7dc2da59400955d867ee783
2017-09-08 16:43:55 -07:00
Treehugger Robot
c9916ddbd7 Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" 2017-09-08 23:40:36 +00:00
Jaekyun Seok
f89dc8488d Revert "Support TimeZoneRulesManagerService in GSI"
This reverts commit b97fd4e603.

Bug: 65001751
Test: no tests
Change-Id: Ia48de712dff393671cd9ce4a9e040ebc16407aa9
2017-09-08 22:22:21 +00:00
Jaekyun Seok
3c8a0e0d71 Merge "Support excluding overlays when enforcing RRO" into oc-mr1-dev
am: aa7f44d4d4  -s ours

Change-Id: Ibfe2acc84b8f2985fd1ed2e73b0475ff610b93cf
2017-09-08 22:00:14 +00:00
Tao Bao
7fec55a033 Skip checking files that have less blocks in block map.
am: afee8f3036

Change-Id: I9f52d22552a6e15e926a36dfd2808a04151d8b31
2017-09-08 21:58:44 +00:00
TreeHugger Robot
aa7f44d4d4 Merge "Support excluding overlays when enforcing RRO" into oc-mr1-dev 2017-09-08 21:53:43 +00:00
Dan Willemsen
d6ed368fde Remove (TARGET|HOST)_BUILD_TYPE path modifications
They don't really affect anything general in android except for the
output path. Debug builds have been broken due to Soong not respecting
*_BUILD_TYPE, and with ninja, we'll properly rebuild if you switch
between release and debug flags. So just remove the path difference.

Bug: 65453318
Test: TARGET_BUILD_TYPE=debug m
Test: code search to find all the users
Change-Id: I5c6a322e0187d96cdaeef891778508c698f841e0
2017-09-08 14:33:34 -07:00
Tao Bao
afee8f3036 Skip checking files that have less blocks in block map.
When creating ext4 images with mke2fs, it may skip allocating some
blocks if they contain all zeros. As a result, there could be less
blocks listed in the block map than the actual file length.

For example, for a file with a length of 112200-byte (27+ blocks),
the listed blocks in block.map could be '43665-43688' (24 blocks).
Because some all-zero blocks are not taking actual space.

The generated ext4 images are perfectly valid - kernel will figure out
that data block is not allocated and writes all zeros into user buffer.
However, we can't fully reconstruct a file from its block list in our
Python script. Ideally this can be avoided by mounting or parsing an
ext4 image directly, which is yet to be supported in our script.

This CL skips checking for such files to avoid failing
validate_target_files.py.

Bug: 65213616
Test: validate_target_files.py passes on targets with mke2fs generated
      images (e.g. marlin).
Change-Id: Id9cc59e345b9283844044ef94ceb5702f0ca0526
(cherry picked from commit b418c30e3a)
2017-09-08 11:22:59 -07:00
Jaekyun Seok
46209f9493 Merge "Support excluding overlays when enforcing RRO" am: 28e1862411 am: 97361fd9c3
am: 010d18d04b

Change-Id: I494c92717c23a456d1a149d3b7e076a5a64dc168
2017-09-08 03:44:14 +00:00
Jaekyun Seok
010d18d04b Merge "Support excluding overlays when enforcing RRO" am: 28e1862411
am: 97361fd9c3

Change-Id: Icd335171fdc34752069ee74754572a17df4ee9a0
2017-09-08 03:39:12 +00:00
Jaekyun Seok
97361fd9c3 Merge "Support excluding overlays when enforcing RRO"
am: 28e1862411

Change-Id: I6b494a84e9087460e4eadb14cf44c33c820b15e9
2017-09-08 03:34:15 +00:00
Treehugger Robot
28e1862411 Merge "Support excluding overlays when enforcing RRO" 2017-09-08 03:21:26 +00:00
Jaekyun Seok
106fa4f771 Support excluding overlays when enforcing RRO
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS will be used to specify overlays
to be excluded from enforcing RRO.

The excluded overlays will be applied into the original package.

Bug: 63600240
Bug: 65001751
Test: succeeded building with
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := \
    vendor/google/google_overlay/static_only \
    vendor/google/nexus_overlay/common/static_only
and confirmed that config_webview_packages existed in framework-res.apk
with the overlayed value, but not in framework-res__auto_generated_rro.apk.

Merged-In: I0bfb44fc7726710bb78d9100404bc6dd29d06a73
Change-Id: I0bfb44fc7726710bb78d9100404bc6dd29d06a73
(cherry picked from commit ccee95e6ec)
2017-09-08 10:40:11 +09:00
Jaekyun Seok
ccee95e6ec Support excluding overlays when enforcing RRO
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS will be used to specify overlays
to be excluded from enforcing RRO.

The excluded overlays will be applied into the original package.

Bug: 63600240
Bug: 65001751
Test: succeeded building with
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := \
    vendor/google/google_overlay/static_only \
    vendor/google/nexus_overlay/common/static_only
and confirmed that config_webview_packages existed in framework-res.apk
with the overlayed value, but not in framework-res__auto_generated_rro.apk.

Change-Id: I0bfb44fc7726710bb78d9100404bc6dd29d06a73
2017-09-08 10:00:46 +09:00
Colin Cross
641b827c11 Merge "Use soong_java_prebuilt.mk to export soong jars to java" am: 11d1c9b02f am: 5d97be5117
am: 7fe5054cd9

Change-Id: I0a24020fd572bd98e029e066839459e2deaaa58a
2017-09-07 23:16:31 +00:00
Colin Cross
7fe5054cd9 Merge "Use soong_java_prebuilt.mk to export soong jars to java" am: 11d1c9b02f
am: 5d97be5117

Change-Id: Ic4ed186b5ec3bb20bda8d2642057dd490c1ccf30
2017-09-07 23:11:55 +00:00
Colin Cross
5d97be5117 Merge "Use soong_java_prebuilt.mk to export soong jars to java"
am: 11d1c9b02f

Change-Id: Ibf5f7f85fbc5f10c8205f32dee8d9ca06164c783
2017-09-07 23:06:58 +00:00
Treehugger Robot
11d1c9b02f Merge "Use soong_java_prebuilt.mk to export soong jars to java" 2017-09-07 22:57:21 +00:00
Chih-Hung Hsieh
32031f6aa4 Merge "Accept alternative email addresses." am: 0b14739e0f am: 6dfe4bc16a
am: 7f11838211

Change-Id: Iec10445efd2039a60650a9c1a4be41039ea95d96
2017-09-07 22:42:09 +00:00
Chih-Hung Hsieh
7f11838211 Merge "Accept alternative email addresses." am: 0b14739e0f
am: 6dfe4bc16a

Change-Id: I6439166126756b26e43be506130526a9a5c5d08d
2017-09-07 22:37:09 +00:00
Chih-Hung Hsieh
6dfe4bc16a Merge "Accept alternative email addresses."
am: 0b14739e0f

Change-Id: I32c6c40c84796601dbd7392c14175c3bda7aa920
2017-09-07 22:32:09 +00:00
Treehugger Robot
0b14739e0f Merge "Accept alternative email addresses." 2017-09-07 22:16:25 +00:00
Colin Cross
be1f792a83 Use soong_java_prebuilt.mk to export soong jars to java
Instead of trying to squeeze soong jars through prebuilt_internal.mk,
make a separate soong_java_prebuilt.mk.

Test: m -j checkbuild
Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-07 13:46:02 -07:00
Chih-Hung Hsieh
2b1efe63cf Accept alternative email addresses.
Some OWNERS files use secondary email addresses, so we only
check existence of _account_id and email attributes.

Test: run against existing OWNERS files
Change-Id: I6f0804a8a90b7a23783c3fe45686d4d973876ed1
2017-09-07 13:07:26 -07:00
Tao Bao
64e506778d Merge "Skip checking files that have less blocks in block map." am: aa599f3916 am: 6b8eeb0bf4
am: ff5c236e34

Change-Id: I5821975ebcbe1032f50cd966fe0800a184a0f9fc
2017-09-07 18:00:50 +00:00
Tao Bao
ff5c236e34 Merge "Skip checking files that have less blocks in block map." am: aa599f3916
am: 6b8eeb0bf4

Change-Id: I25cb9e06ddcb47b2ab6b76a4fb6219bf62b6a47e
2017-09-07 17:58:50 +00:00
Tao Bao
6b8eeb0bf4 Merge "Skip checking files that have less blocks in block map."
am: aa599f3916

Change-Id: I11ea419d275b5af8f0b095377fbdb19fee465c1d
2017-09-07 17:56:50 +00:00
Tao Bao
aa599f3916 Merge "Skip checking files that have less blocks in block map." 2017-09-07 17:50:51 +00:00
SzuWei Lin
981a41ed2b Merge "Remove root folder bt_firmware in GSI" into oc-mr1-dev
am: 4ee9bb6caa

Change-Id: I668f32c255004ed205634f5c91d7ca3473f1e582
2017-09-07 15:08:07 +00:00
SzuWei Lin
980eb21f47 Merge "Revise GSI to inherit from aosp_base.mk and telephony.mk" into oc-mr1-dev
am: 032adc13c9

Change-Id: I062c199c41bb80d82a358106afa20497ea857fc3
2017-09-07 15:00:53 +00:00
TreeHugger Robot
4ee9bb6caa Merge "Remove root folder bt_firmware in GSI" into oc-mr1-dev 2017-09-07 14:59:43 +00:00
Ian Pedowitz
21873fbd4f Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev
am: 418b291486

Change-Id: Idfe46f6fb6b1aedae5a42445cd196204303c199b
2017-09-07 14:50:05 +00:00
Adam Seaton
d09059851c Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours am: 181a73eeb6 am: f84b592ed3
am: 99dd08dfdd

Change-Id: Ic4886449f06ef51a9d03f2394a406198348dae26
2017-09-07 14:48:44 +00:00
TreeHugger Robot
032adc13c9 Merge "Revise GSI to inherit from aosp_base.mk and telephony.mk" into oc-mr1-dev 2017-09-07 02:50:17 +00:00
Sundong Ahn
11b95f1197 Merge "configstore: remove configstore 1.1" into oc-dr1-dev-plus-aosp
am: e8d229c70f  -s ours

Change-Id: I6d7c72caae433d205bae769921d7250ad2bce0b7
2017-09-07 01:24:04 +00:00
Sundong Ahn
fa8a5d914e configstore: remove configstore 1.1
am: 43e711962e  -s ours

Change-Id: I7fb83ba2e62b2a5eca01d97fffad8cbdb6f12cdd
2017-09-07 01:14:39 +00:00
TreeHugger Robot
e8d229c70f Merge "configstore: remove configstore 1.1" into oc-dr1-dev-plus-aosp 2017-09-07 01:09:31 +00:00
Adam Seaton
cb72cda511 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours am: 181a73eeb6 am: f84b592ed3
am: 9afe3d5af4

Change-Id: If15c80a5c737fb8e92430c8454eecda977a63a90
2017-09-06 23:51:54 +00:00