Commit Graph

39284 Commits

Author SHA1 Message Date
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
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
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 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 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 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
Tao Bao d861714097 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-07 13:35:56 -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 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
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 9afe3d5af4 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

Change-Id: Iab645cd734fa73a74df517733edc2913a4d7378b
2017-09-06 23:43:30 +00:00
Adam Seaton f84b592ed3 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

Change-Id: If43281749e89e68fdf6cbc55ec5966da988c9aa9
2017-09-06 23:39:24 +00:00
Adam Seaton 181a73eeb6 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

Change-Id: I53c53bd284132418949d4380e7260b700cfecd7e
2017-09-06 23:35:23 +00:00
Adam Seaton 77d8b88c61 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

Change-Id: I5ba8a549b8eac9598ea67e0aa53eae5cf7d9b28d
2017-09-06 23:31:23 +00:00
Adam Seaton abf1d733f3 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

Change-Id: Ibae3d0687defb616f986ae9b6663a535506a5b8b
2017-09-06 23:27:25 +00:00
Adam Seaton 6613b4e6fc 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

Change-Id: I1d9f7c840f236c1a4a009cab84d8ba4a987eeba7
2017-09-06 23:22:54 +00:00
Adam Seaton e522ce436f 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

Change-Id: I7918cab321e5fbd9a1ed2f220387b715f5ae0dbc
2017-09-06 23:18:54 +00:00
Adam Seaton 137d5f095a 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

Change-Id: Iab67b2fdd9aac710472268edba1be79161b6e554
2017-09-06 23:14:52 +00:00
Adam Seaton fbd8bcf329 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

Change-Id: I8cfa5ccc04fa609f926b27068214ab96c42eb772
2017-09-06 23:10:23 +00:00
Adam Seaton 40720f6a25 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b
am: bf38f45749

Change-Id: I10e741ba36e2f3570d70698fdece3d43dc93ad12
2017-09-06 23:05:23 +00:00
Adam Seaton bf38f45749 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev
am: 84557be29b

Change-Id: I9289b586b2aa28590dde1cdc90d21a45c4a27dbb
2017-09-06 23:00:22 +00:00
Adam Seaton 84557be29b Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev 2017-09-06 22:44:40 +00:00
Tao Bao 9e8416917a Merge "releasetools: Validate A/B OTA payload signatures." am: 631b3a031c
am: d5ec31f8a9

Change-Id: I8d6e66690818f61816272d8b950a1e5ddfbef139
2017-09-06 21:07:46 +00:00
Tao Bao d5ec31f8a9 Merge "releasetools: Validate A/B OTA payload signatures."
am: 631b3a031c

Change-Id: I3abd410e0709cd44b2e2b74471e3cc023dba7cd5
2017-09-06 20:48:14 +00:00
Tao Bao 631b3a031c Merge "releasetools: Validate A/B OTA payload signatures." 2017-09-06 20:35:07 +00:00
Tao Bao b418c30e3a 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
2017-09-05 15:53:24 -07:00
Steven Moreland fdce598ed8 aosp_arm64_ab is vndk
Test: builds with BOARD_VNDK_VERSION=current
Test: test only one product is using this w/ multiproduct_kati
Bug: 65375837
Merged-In: I972ab897a8bc23ba5c5f6bf133db0017e4334f40
Change-Id: I972ab897a8bc23ba5c5f6bf133db0017e4334f40
2017-09-05 22:31:30 +00:00
Mathieu Chartier 26bd213b8c Merge "Fix boot image profile in make files" am: 71f622e247
am: c48a5c0a31

Change-Id: I4ec59313c10974a583ac07ef4e2f9bfee5cf38c0
2017-09-05 17:34:30 +00:00
Mathieu Chartier c48a5c0a31 Merge "Fix boot image profile in make files"
am: 71f622e247

Change-Id: Iceb0a45af68573116681cca05c1f400ac156b596
2017-09-05 17:26:32 +00:00
Mathieu Chartier 71f622e247 Merge "Fix boot image profile in make files" 2017-09-05 17:14:08 +00:00
Mathieu Chartier a2cc65b099 Fix boot image profile in make files
Update location to framework/base/config instead of frameworks/base

Fixed dex2oat dependency to my_out_boot_image_profile_location
instead of my_out_profile_location.

Bug: 37966211
Test: make and flash

Merged-In: I446f11216cf6342861bbbf56ac5c4da2f36fb755

(cherry picked from commit 75edf540e2)

Change-Id: I4a34be8a344880d3e2ccaea3ed0e6390616e0d6c
2017-09-02 23:47:32 +00:00
Nan Zhang 6248e3fbaf Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 2fc0f4e484
am: dc8ddb2da5

Change-Id: Iee9aca0d47f5cd80d0c3d872ea6325cca3d66963
2017-09-02 19:43:39 +00:00
Nan Zhang dc8ddb2da5 Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"
am: 2fc0f4e484

Change-Id: Ic57ec8debe84102c55b63e2bdfb94a41da86d71c
2017-09-02 19:36:10 +00:00
Treehugger Robot 2fc0f4e484 Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" 2017-09-02 19:26:48 +00:00
Nan Zhang 9e37028db0 Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor
git-wear-master/mirror-aosp-master-with-vendor were still broken due to
my Make synatx mistakes.

Bug: b/64308460

Test: download <git-wear-master> branch locally, and then do:
m -j out/target/product/anglefish/package-stats.txt

Change-Id: Ic1a03b452db7583811a3a3b74067f1fc54f873b4
2017-09-02 10:25:17 -07:00
Nan Zhang 4a03375cc7 Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 99e44773ba
am: e665010297

Change-Id: I2e1d3109dae69068a9b9b14751a42065e8d17902
2017-09-02 05:15:53 +00:00
Nan Zhang e665010297 Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"
am: 99e44773ba

Change-Id: If6bb6ff7147e221b85d3750eeddbd1870d464ed8
2017-09-02 05:09:23 +00:00
Nan Zhang 99e44773ba Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" 2017-09-02 04:57:12 +00:00
Nan Zhang d05e19df41 Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor
The problem is that when I added .KATI_RESTAT for javalib.jar, I didn't
change the function: create-empty-package to generate javalib.jar.tmp.

The problem causes the build breakage on MacOS/Jack.

Bug: b/64308460

Test: download <git-wear-master> branch locally, and then do:
m -j out/target/product/angelfish/package-stats.txt

Change-Id: I9a5d74caaf164b44676e456050b4f8a5b3bdded0
2017-09-01 18:52:41 -07:00