Commit graph

48003 commits

Author SHA1 Message Date
Jiyong Park
185d41e84d Add PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES
It is a list of <module_name>:<manifest_name> pairs. When the module
name of an APK or an APEX matches with <module_name>, then its app
manifest name is overridden to <manifest_name>.

<module_name> and <manifest_name> can be patterns as in
com.android.%:com.mycompany.android.%.release

Test: m with PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES for
1) an APK in Android.mk
2) an APK in ANdroid.bp
3) an APEX
and check that manifest names are modified as specified

Change-Id: Ic09e059ea7b7ea99a50a1cf423a25aa587ef4466
2019-01-09 21:08:10 +09:00
Anton Hansson
fe9f373e10 Merge "Fix qemu image definition conditionals" 2019-01-09 10:33:51 +00:00
Treehugger Robot
104904bdf0 Merge "Refactor GSI BoardConfig.mk" 2019-01-09 06:05:41 +00:00
Thomas Joseph Avila
6083089f7a set BUILD_ID=PI
Bug: 122310206
2019-01-08 15:36:57 -08:00
Benjamin Schwartz
1a3c9f26d1 Merge "Add android.hardware.power.stats@1.0 to current.txt" 2019-01-08 17:58:59 +00:00
Anton Hansson
0909191b82 Merge "Move overridden AOSP modules out of *_system mks" 2019-01-08 16:20:47 +00:00
Anton Hansson
3a4a966507 Merge "Add adb_keys to mainline_system if they exist" 2019-01-08 11:40:25 +00:00
Anton Hansson
64bf2593f0 Merge "Add mainline.mk" 2019-01-08 11:40:11 +00:00
Anton Hansson
46441eac2f Merge "Wifi: Add Wifi library to mainline_system" 2019-01-08 10:22:21 +00:00
Anton Hansson
811f2392c0 Move overridden AOSP modules out of *_system mks
All these modules are to be moved to /product, as they are not
part of the core system image. Move them out of the _system mks
as a start, and temporarily whitelist them so that they can be
moved iteratively.

Bug: 122353713
Test: make
Change-Id: If658e6b4565924cd915a183400c5b2b32984eca4
Merged-In: If658e6b4565924cd915a183400c5b2b32984eca4
2019-01-08 10:03:58 +00:00
SzuWei Lin
1457b3fcbf Refactor GSI BoardConfig.mk
The patch modifies the Legacy GSI to use BoardConfigGsiCommon.mk
instead of board config treble-common*.mk, and delete these
treble-common*.mk files.

After the patch, the GSI common board configs are in single file
BoardConfigGsiCommon.mk

The patch also includes:

- Moving `TARGET_COPY_OUT_VENDOR := vendor` to
  BoardConfigGsiCommon.mk, because GSI always contains no vendor
  contents.
- Configure the binder interface bitness explicitly.
- Unify the structure of each BoardConfig.mk.

Bug: 122282239
Test: compare the out folder between with and without the patch
Test: output files are all the same
Change-Id: Ie5901446920dda317dea848e6d5a7bbcf10a32cf
2019-01-08 17:35:05 +08:00
Ahmed ElArabawy
69e62af873 Wifi: Add Wifi library to mainline_system
This commit adds android.hardware.wifi@1.0.so to mainline_system.

Bug: 122363107
Test: Successful build
Test: lunch crosshatch-userdebug ; make -j64
Test: lunch mainline_system_arm64; make -j64
Change-Id: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
Merged-In: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
(cherry picked from commit b38ce5a6ff)
2019-01-08 09:24:48 +00:00
Treehugger Robot
ebe0590d0a Merge "Set 32bits Legacy GSI to be 32bits binder" 2019-01-08 09:19:36 +00:00
Treehugger Robot
d968c5dab1 Merge "Remove data binding from master build" 2019-01-08 04:56:01 +00:00
Treehugger Robot
dc1f4499d0 Merge "Fix depfile output from dexpreopt strip script" 2019-01-08 02:19:35 +00:00
Yigit Boyar
a53f680352 Remove data binding from master build
Data Binding only works as part of tools. It also only builds there
(in studio-master-dev branch). This CL removes references to the data
binding checkout which will be followed by removal of data binding
from master manifest.

Bug: 122478832
Change-Id: I338cc1aa10a5ad39114bc0ed14a529365016e9a4
2019-01-08 00:43:03 +00:00
Tao Bao
9f1eda65e6 Merge "Don't build retrofit OTA package if vendor.img is unavailable." 2019-01-07 23:49:23 +00:00
Dan Willemsen
07b73576e4 Fix depfile output from dexpreopt strip script
strip.sh uses $2.d to write the depfile, while this had been passing in
$@.tmp in as $2. Instead, move the file first, then use strip.sh with
the real output file so that we can find the depfile.

Also don't specify a depfile (or other dependencies) when
LOCAL_CERTIFICATE==PRESIGNED, as we'll skip all of that in the rule in
that case.

Bug: 121058584
Test: NINJA_ARGS="-w missingdepfile=true" m
Change-Id: I1323e775e3a6ce5a06a19d59f3fb07495f116f34
2019-01-07 15:06:48 -08:00
Vinay Kalia
0d7b8c02d2 Add android.hardware.power.stats@1.0 to current.txt
BUG: 117424656
Test: Compilation and device boot
Change-Id: I3c7263c83ab7b245205a21c7c503e8fe43a23de7
(cherry picked from commit 72bbe36216)
Merged-In: I3c7263c83ab7b245205a21c7c503e8fe43a23de7
2019-01-07 14:08:30 -08:00
Treehugger Robot
4ab7bb3ee8 Merge "Save invocation info of dex2oat runs." 2019-01-07 21:38:16 +00:00
Tao Bao
519d18286e Don't build retrofit OTA package if vendor.img is unavailable.
We used to build retrofit full OTA package as long as
PRODUCT_RETROFIT_DYNAMIC_PARTITIONS is true. This doesn't work with AOSP
targets that have the flag set but without any available vendor image.

This CL detects such a condition and uses a separate flag to guard the
retrofit OTA building as well as the split super images generation.

Bug: 120852744
Test: `m -j dist` on blueline (w/ vendor images) and aosp_blueline (w/o
      vendor images).
Change-Id: I65726f24f8fc546be6802941a6a06590a3804c16
2019-01-07 12:22:48 -08:00
Treehugger Robot
0d5fcc075e Merge "Making abb part of system image." 2019-01-07 19:34:32 +00:00
Yifan Hong
b3f5918890 Merge "Allow devices launched with DAP to override super partition name." 2019-01-07 18:26:17 +00:00
Treehugger Robot
ebe0b7a1c9 Merge "Remove more Android.mk files from build/make" 2019-01-07 17:44:20 +00:00
Anton Hansson
fdc3203ef0 Add mainline.mk
Contains mainline_system and the relevant AOSP packages for the
other partitions. Intended to be inherited by the aosp_X variants
of mainline devices.

Bug: 118826166
Test: build mainline_arm64
Change-Id: I7d1953bf5ccda4d9652dca4d32efb75b31015342
2019-01-07 16:49:29 +00:00
Treehugger Robot
575402b967 Merge "Fix hiddenapi-greylist.csv generation." 2019-01-07 16:28:31 +00:00
Alex Buynytskyy
8a96a65bc7 Making abb part of system image.
Test: manual

Change-Id: Id8921e0afa0d1f94d439f4a35d71bb017ed6f765
2019-01-07 15:45:21 +00:00
Treehugger Robot
c3efc773aa Merge "Update OWNERS for dex preopt related files." 2019-01-07 15:28:43 +00:00
Mathew Inwood
0fa280036b Fix hiddenapi-greylist.csv generation.
It was referring to a non-existant macro paramater resulting in empty
output.

Test: m out/target/common/obj/PACKAGING/hiddenapi-greylist.csv
& then check output.

(cherry picked from commit 8626c8ea95)

Change-Id: Ib48042ecca320c4d7c3a27959e41e5c55099b27a
Merged-In: Ib48042ecca320c4d7c3a27959e41e5c55099b27a
2019-01-07 14:59:51 +00:00
Anton Hansson
0cb36d7bbc Add adb_keys to mainline_system if they exist
Similar to I1720644d89ec5289fbe99f95ebcdfbb3f3b20e67,
but for mainline_system. This reduces the diff between
full_base.mk and mainline_system, a step on the way to
get aosp_blueline inheriting mainline_system.

Bug: 118826166
Test: make
Change-Id: I52bfe5dfb3e1a22db2d46fe9d1f372ee25533fdd
2019-01-07 14:36:12 +00:00
Anton Hansson
14fc7361b9 Merge "Add a languages_default.mk" 2019-01-07 10:32:25 +00:00
Anton Hansson
47ca8d0a73 Merge "Remove km_MH locale from mainline" 2019-01-07 10:31:52 +00:00
SzuWei Lin
aee5affa6d Set 32bits Legacy GSI to be 32bits binder
The binder interface bitness is always 64bits from P.
To keep 32bits binder interface for Legacy GSI, we need to explict
configure it.

Bug: 122282239
Test: lunch aosp_arm_ab-userdebug; make -j
Change-Id: I90b45adb52c398d1c0cf3f877199f9dd1e0b3f86
2019-01-07 18:23:42 +08:00
Tor Norbye
5ca77c512c Merge "Switch apicheck over from doclava to metalava" 2019-01-06 16:04:33 +00:00
Dan Willemsen
ef45381221 Remove more Android.mk files from build/make
soong_ui is passing the Android.mk file list to Kati, and it ignores
Android.mk files found via symlinks, so we don't need the workarounds
for build/make/target/board/Android.mk and build/target/board/Android.mk
both existing.

We've got dist support in Soong now, so we can remove the signapk
Android.mk

Bug: 122332221
Test: m dist out/dist/signapk.jar out/dist/libconscrypt_openjdk_jni.so
Change-Id: I2ac9016b04146340c5ac80f7090d00e186023574
2019-01-05 02:40:45 +00:00
Treehugger Robot
dacde2259f Merge "Increase slack for inode estimation algorithm" 2019-01-05 01:22:43 +00:00
Treehugger Robot
afdd7b99e5 Merge "Remove nonsensical inclusion of Home" 2019-01-05 01:17:41 +00:00
Yifan Hong
035c0ea0d4 Allow devices launched with DAP to override super partition name.
Test: on cuttlefish
Bug: 111801737
Change-Id: Ibb9b7132898d3c871186ded01432de4419809e7c
2019-01-04 16:03:50 -08:00
Sandeep Patil
35972d1b1a Add 'dmctl' to default debug utilities.
dmctl can list all device mapper targets and their tables which is
extremely useful information for a bugreport. Especially to compare
the device mapper setup with the partition metadata.

Bug: 120916687
Test: 'dmctl list device -v'

Change-Id: I9e3afcf146b2814b0304f69cdf6029303beb57c7
Merged-In: I9e3afcf146b2814b0304f69cdf6029303beb57c7
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-04 15:24:19 -08:00
Ruchi Kandoi
4c4ba4e0d9 Merge "Add android.hardware.nfc@1.2 to VNDK" 2019-01-04 19:56:41 +00:00
Hridya Valsaraju
e8e7958c13 Increase slack for inode estimation algorithm
This is required to prevent build failure on some targets.

Test: mmm
Bug: 119115481

Change-Id: Idf7c21b163a4e10e2ef435c2b2a7795a42feb200
2019-01-04 09:18:07 -08:00
Anton Hansson
7216f022a5 Remove nonsensical inclusion of Home
Home is overriden by Launcher3QuickStep, so listing these two
in the same mk is a noop.

Test: make
Change-Id: I2865a5346c63efd78e434185041f320ca344e854
2019-01-04 16:00:21 +00:00
Treehugger Robot
150cc7c0d4 Merge "Remove languages_small.mk" 2019-01-04 15:55:05 +00:00
Treehugger Robot
a84df446be Merge "Fix dep filename for rs.srcjar" 2019-01-04 15:17:50 +00:00
Anton Hansson
c004218b8b Add a languages_default.mk
This is the same list of languages that was in mainline_system.mk
before, but sorted alphabetically.

Make languages_full inherit this list and add the only locale present
that was previously unique (the en_XC pseudo-locale).

Test: make
Change-Id: I09f0c7521740d4c779d5fd2a50baa92b7cdfe8d4
2019-01-04 14:19:59 +00:00
Anton Hansson
beb15ac6a8 Remove km_MH locale from mainline
This doesn't appear to be a real locale. The interpretation would be
khmer spoken in the Marshall Islands, which doesn't appear to be a thing.
The locale doesn't appear in https://lh.2xlibre.net/locales/ or
frameworks/base/core/res/res/values/locale_config.xml.

It might have been a typo when it was introduced in internal change
I78d91916fdbb04502466c26bf7d160fe679aaa31.

Test: make
Change-Id: Id1deebdd8ad2a5601c15b84e010be766b3a951e9
2019-01-04 14:15:04 +00:00
Treehugger Robot
ad68902d5a Merge "Add Tag to mainline_system" 2019-01-04 13:47:30 +00:00
Anton Hansson
ffa1da0620 Remove languages_small.mk
Not imported by any known products.

Test: build_test
Change-Id: Id4e79ca14b57f6e63260424802f9a063bcb4de4f
2019-01-04 13:05:52 +00:00
Tianjie Xu
daf0839f0b Merge "recovery text images: Use center_alignment for background texts" 2019-01-04 07:26:32 +00:00
Dan Willemsen
a9cb7e3392 Fix dep filename for rs.srcjar
Caught by https://android-review.googlesource.com/861510

Bug: 121058584
Test: m out/target/common/obj/APPS/Gallery2_intermediates/renderscript/rs.srcjar
Test: NINJA_ARGS="-t deps out/target/common/obj/APPS/Gallery2_intermediates/renderscript/rs.srcjar" m
Change-Id: I92a803963f4431e8506b1f2517a7186d16667709
2019-01-03 22:14:56 -08:00