Commit graph

47716 commits

Author SHA1 Message Date
Tao Bao
a19f8e993b Pack libfec.so into otatools.zip.
delta_generator now has a dependency on libfec.so [1], for generating
A/B incrementals.

[1] https://android-review.googlesource.com/c/platform/system/update_engine/+/854154

Bug: 122280472
Test: `m -j otatools-package` with aosp_marlin-userdebug. Check that
      `otatools.zip` contains libfec.so.
Change-Id: Ia6642bb2c7ccb0f89ad3079bdf65e4dbffee13f5
2019-01-02 23:24:51 -08:00
Dan Willemsen
5723181c53 Merge "Produce ro.build.version.preview_sdk_fingerprint" 2019-01-01 05:55:50 +00:00
Dan Willemsen
ad6a15433e Produce ro.build.version.preview_sdk_fingerprint
This is just a hash of the current.txt and system-current.txt right now,
though it may expand to include other API surfaces in the future.

Once prebuilts/sdk/current is populated with api_fingerprint.txt files,
we can use those for unbundled builds, but until then, just use the
PLATFORM_PREVIEW_SDK_VERSION as a placeholder.

MD5 was just the most convenient, since we don't have a sha tool that we
can use on Mac currently. I'm hoping we can get a toybox-based tool in
the future that standardizes that, but we aren't currently using sha*sum
from toybox on Linux, much less on Darwin yet.

Test: m dist out/dist/api_fingerprint.txt
Test: m out/target/product/.../system/build.prop
Change-Id: If69f270560d05135cb81a9bb2d1b208ea78f86df
2018-12-27 12:30:05 -08:00
Remi NGUYEN VAN
7264a0daab Merge "Build NetworkStack package" 2018-12-26 00:48:25 +00:00
Treehugger Robot
c0b701b241 Merge "Prevent PYTHONPATH from accumulatively growing." 2018-12-22 07:36:16 +00:00
Jim Tang
22f4c322d6 Prevent PYTHONPATH from accumulatively growing.
After running "lunch" multiple times, the global variable
PYTHONPATH grows larger and larger with repetively content.
This patch is to prevent PYTHONPATH from prepending redundant path.

Bug: b/121110600

Test: $ source build/envsetup.sh && lunch
      $ echo $PYTHONPATH | sed 's/:/\n/g'
      $ lunch; lunch
      $ echo $PYTHONPATH | sed 's/:/\n/g' # not growing.

Change-Id: Ifc36d071fb63bb1494bb0a94fdff477a41708c74
2018-12-22 11:19:40 +08:00
Patrik Fimml
4bc5c8fed5 Merge "Push cameraserver downstream from base_system.mk." 2018-12-21 13:05:38 +00:00
Patrik Fimml
618f1b2c0c Push cameraserver downstream from base_system.mk.
Some non-phone form factors don't want cameraserver to save storage and RAM.
Pushing it down to handheld and other build files allows selective inclusion to
happen there.

Intended to be a no-op refactoring, will disable for ATV in a follow-up CL.

Bug: 118369095
Test: built system image for random device as smoke test
Change-Id: I260fa5c9e512341d6a6824afebd5e8273fa5e66c
Merged-In: I260fa5c9e512341d6a6824afebd5e8273fa5e66c
2018-12-21 11:53:09 +00:00
Treehugger Robot
03ad103695 Merge "Use ASAN linker for native tests" 2018-12-21 06:54:22 +00:00
Mikhail Naganov
aa73cefbc4 Use ASAN linker for native tests
Native tests (BUILD_NATIVE_TEST) use their own MODULE_CLASS.
Check for it when selecting the linker for ASAN.

Test: build a native test, readelf -l <test> | grep linker
Change-Id: I34ca8c443c792bdf8b4b1fa812806c56f13a72d0
2018-12-20 16:15:54 -08:00
Treehugger Robot
92b623259b Merge "Don't write vendor to dynamic_partitions_info.txt if it's unavailable." 2018-12-20 20:45:40 +00:00
Tianjie Xu
28b6654ee7 Merge "blockimgdiff: add a function to select and convert 'diff' to new" 2018-12-20 20:15:01 +00:00
xunchang
3df4d5eb6d blockimgdiff: add a function to select and convert 'diff' to new
Package size will be unintended large if we stash more blocks than the
stash limit specified by the cache size. To reduce the maximum size of
simultaneous stashed blocks, we will inevitably convert some 'diff'
commands to 'new' commands.

To mitigate the impact, we add a new function to smartly select the
transfers to convert based on their patch size and compressed size.
This cl converts the transfers that have a larger patch size than the
compressed target sizes. And there's a slightly improvement in the
final package size: from 194M -> 185M.

Bug: 120561199
Test: build a non-A/B incremental package, run simulator
Change-Id: Id73ff736ba4e6901d245ad5549d42310d0740284
2018-12-19 20:21:25 -08:00
Treehugger Robot
daf5a10602 Merge "Add lpdump to all builds" 2018-12-20 02:32:53 +00:00
Colin Cross
059edc0a96 Merge "Add a flag to allow unbundled builds to build SDKs from source" 2018-12-20 00:35:59 +00:00
Colin Cross
883b168577 Merge "Hide unzip warning when zip file is empty" 2018-12-19 23:47:22 +00:00
Colin Cross
cff1cee3f1 Hide unzip warning when zip file is empty
unzip prints a warning and exits with code 1 when a zip file is empty.
Pipe the output of unzip through grep -v to hide the warning,
using PIPESTATUS to preserve the exit code of unzip, and then
filter out exit codes that are not 0 or 1.

Test: m
Change-Id: If2cf725fc3315d5996d5a7190288df46d84a59e2
2018-12-19 23:47:10 +00:00
Treehugger Robot
17e9a79fb0 Merge "Log only errors when invoking veridex." 2018-12-19 23:46:04 +00:00
Tao Bao
943fa4c523 Don't write vendor to dynamic_partitions_info.txt if it's unavailable.
If an AOSP target is built with dynamic partitions support but without
vendor.img available at build time, don't write 'vendor' to
dynamic_partitions_info.txt that will be used for building OTA packages.

We can't remove the partition from BoardConfig file, because the name
will be still needed in other places, such as generating the partition
metadata (super_empty.img). Otherwise manually flashing vendor.img at a
later point would require additional steps (e.g. `fastboot
create-logical-partition`).

Bug: 120852744
Test: `m -j dist` with and without vendor projects.
Change-Id: Ia1c3ed5bbea0255f1908958140dac97a1597586d
2018-12-19 14:17:55 -08:00
Yifan Hong
4663e3257a Add lpdump to all builds
Right now, it takes 29K.

Test: builds

Change-Id: I8f2e4be52cca6697724988ddc880aa6f29166cd1
2018-12-19 11:32:54 -08:00
Dario Freni
ee835c736b Log only errors when invoking veridex.
Test: m
Bug: 121225084
Change-Id: I7e8cfbb7b0bcdb3f8d941086ce920da38d558145
2018-12-19 18:24:53 +00:00
Treehugger Robot
00d74cc938 Merge "Apply skip mounting product and other partitions in GSI" 2018-12-19 11:05:00 +00:00
Nicolas Geoffray
c857ed2acd Merge "Fix build time preopt with shared library uses." 2018-12-19 08:37:01 +00:00
Colin Cross
8e0ff1c370 Add a flag to allow unbundled builds to build SDKs from source
Mainline modules are tightly coupled to the platform, and should
build against the current SDK from source and not prebuilts. Add
a flag UNBUNDLED_BUILD_SDKS_FROM_SOURCE to specify that a
TARGET_BUILD_APPS build should build the current SDK instead of
using the prebuilts.

Bug: 121194841
Bug: 121231426
Test: no change to out/build-aosp_sailfish.ninja
Test: forrest unbundled build
Test: forrest master apps build
Test: forrest mainline modules build
Change-Id: I9ebc08745409a817d831817cb282aba1de6d81bb
2018-12-18 22:43:16 -08:00
SzuWei Lin
2d541f35cd Apply skip mounting product and other partitions in GSI
Uses skip_mount.cfg for `init` to skip mounting product and
product_service paritions in GSI. The patch also removes
the un-mount in `init.gsi.rc`.

With this patch, a device with flashing GSI will not use the
content in product/prodcut_service partitions on the device
and will always use the content under /system/product in GSI.

The patch also rename the target/product/vndk to
target/product/gsi.

Bug: 120208657
Bug: 117246558
Test: Boot blueline master/P with flashing aosp_arm64-userdebug
Test: /product and /product_service should be symbolic links
Change-Id: Idc9c60e5a05b3d90fc4ab64b0ac000571849b19b
2018-12-19 14:42:27 +08:00
Treehugger Robot
a4fd5e72a4 Merge "Remove libunwind from VNDK" 2018-12-19 04:16:26 +00:00
Justin Yun
c80ae22e44 Remove libunwind from VNDK
libunwind has no dependency on vendor modules.
Remove it from VNDK list.

Bug: 120948701
Test: build and boot
Change-Id: Ic4c0080fea7da021334aaa1a81b3b7377b06f62f
2018-12-19 00:57:17 +00:00
Treehugger Robot
81e29e0969 Merge "Add missing dependency on common javalib.jar" 2018-12-18 21:17:07 +00:00
Colin Cross
54a71e229b Add missing dependency on common javalib.jar
Building $OUT/obj/JAVA_LIBRARIES/core-tests_intermediates/javalib.jar
is no longer updating the common intermediates:
out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/javalib.jar
out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar
after I25163e91886cea6941afa25cdb529ed053278dcb.  Add the missing
dependency on common javalib.jar, which already depends on common
classes.jar.

Bug: 119412419
Bug: 121194944
Test: rm out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar &&
      m core-tests &&
      ls out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar

Change-Id: Id463d159e46c82656c364fdb2dbe53f33ee1a103
2018-12-18 11:06:25 -08:00
Nicolas Geoffray
c04f3126f4 Fix build time preopt with shared library uses.
- Handle hidl libraries.
- Handle new shared library encoding.

Test: no mismatch preopt during boot.
bug: 117845483
bug: 111174995
Change-Id: Ie4bca653594c72df2eb2fdd827bc73cfcb76b1d7
2018-12-18 17:33:02 +00:00
Treehugger Robot
632d154393 Merge "Don't install boot.art when WITH_DEXPREOPT is false" 2018-12-18 16:33:59 +00:00
Colin Cross
19fbc1b9e9 Don't install boot.art when WITH_DEXPREOPT is false
Don't create the install rules for boot.art when WITH_DEXPREOPT
is not set to true, which will ensure there is no dependency on
boot.art in a normal build, which matches the behavior before
I25163e91886cea6941afa25cdb529ed053278dcb.

This should fix the Mac build, which never sets WITH_DEXPREOPT
and does not support running dex2oat.

Bug: 119412419
Bug: 121130576
Bug: 121183382
Test: lunch aosp_sailfish-eng && m WITH_DEXPREOPT=false
      files does not depend on out/target/product/sailfish/dex_bootjars/system/framework/arm/boot.art
Change-Id: I39e96b1f35f6808d3007cf1785ec3db89e0decb6
2018-12-18 15:36:36 +00:00
Anton Hansson
632ee3dee8 Merge "Allow mainline_arm64 to have product contents" 2018-12-18 14:35:20 +00:00
Anton Hansson
acb3084aa2 Allow mainline_arm64 to have product contents
The device currently targeted does not have a product partition.
Adding product-specific apps to it therefore trips up the artifact path
check for /system.

Workaround that by whitelisting /system/product/% for now. This should
be removed when the device has the right partitions.

Bug: 110072687
Test: build mainline_arm64
Merged-In: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab
Change-Id: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab
2018-12-18 14:34:29 +00:00
Treehugger Robot
7cac3adf1a Merge "Relax inode usage estimation slack for DAP right sizing" 2018-12-18 02:13:10 +00:00
Colin Cross
d73e21ad3b Merge "Move dexpreopting to Soong" 2018-12-18 01:54:32 +00:00
Colin Cross
6db5b0ea9a Move dexpreopting to Soong
Move the dexpreopting logic into Soong.  Make modules will be
dexpreopted by executing the Soong logic in the standalone
dexpreopt_gen binary, which will generate scripts that will
perform dexpreopting for each module.  Export global configuration
as JSON to $OUT/dexpreopt.config, which will be used by
dexpreopt_gen and Soong, and per-module JSON configuration that
will be used by dexpreopt_gen.

This relands I59b20c931ee3e5a8d35eb30da4148691c5095502,
I39d580999947ee54cfefe875b57a028be5333bd7,
Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and
Ica006a007d112c232311435aaac0c0e476232b67, with a minor
update to match the changes made to dexpreopt_gen arguments
and a fix to correctly keep dexpreopt disabled on mac builds.

Bug: 119412419
Bug: 120273280
Test: no differences to dexpreopt outputs on aosp_sailfish system/,
      only expected changes to dexpreopt outputs on system_other
      (.vdex files for privileged Soong modules no longer incorrectly
      contain .dex contents).
Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-12-17 13:46:17 -08:00
Treehugger Robot
b7e7f7c771 Merge "Remove file named .d created in the source directory" 2018-12-17 20:49:24 +00:00
Treehugger Robot
29dddab453 Merge "Restore reverted CleanSpec" 2018-12-17 20:49:19 +00:00
Treehugger Robot
9aaf0d4019 Merge "Add rss_hmw_reset to system partition" 2018-12-17 12:31:26 +00:00
Colin Cross
ab84792815 Remove file named .d created in the source directory
I59b20c931ee3e5a8d35eb30da4148691c5095502 accidentally wrote depsfiles
to a file called .d in the top level of the source tree, remove them.

Bug: 119412419
Test: m
Change-Id: Iaf71a64a7ee4aa39084423dfd16aa934613ba158
2018-12-15 19:13:29 -08:00
Colin Cross
e07a32b124 Restore reverted CleanSpec
Ica006a007d112c232311435aaac0c0e476232b67 added a clean step that was
reverted in I0ce3ad70c73ff997aacaf411b0b5dc73760e7f91.  Reverting
a clean step could cause a future clean step to be skipped, because
Make only tracks how many clean steps have been run out of each
CleanSpec.mk file.  Add back the reverted clean step.

Bug: 119412419
Test: none
Change-Id: I11fe12d7c3526ccc21f468b350b4288cb55a9447
2018-12-15 19:05:07 -08:00
Treehugger Robot
7a005549ae Merge "Add owners for fs_config" 2018-12-15 00:14:11 +00:00
Hridya Valsaraju
bd17fab260 Relax inode usage estimation slack for DAP right sizing
The current increase of 4 % is insufficient for some
targets.

Test: mmm
Bug: 119115481
Change-Id: Idcba8025b913da9b70794bfc7464d15b4d99ad34
(cherry picked from commit 3e02e34090)
2018-12-14 14:13:24 -08:00
Colin Cross
b334d17103 Merge changes from topic "revert-soong-dexpreopt"
* changes:
  Revert "Move dexpreopting to Soong"
  Revert "Add missing dependency on zip2zip"
  Revert "Create directories before unzipping dexpreopt zip"
  Revert "Correctly create directories before unzipping dexpreopt zip"
2018-12-14 19:56:05 +00:00
Colin Cross
b8901d7fb8 Revert "Move dexpreopting to Soong"
This reverts commit e736c58043.

Test: none
Bug: 119412419
2018-12-14 11:49:55 -08:00
Colin Cross
7f9ccd53d7 Revert "Add missing dependency on zip2zip"
This reverts commit e373b3f08b.

Test: none
Bug: 119412419
2018-12-14 11:49:55 -08:00
Colin Cross
24258b1fb1 Revert "Create directories before unzipping dexpreopt zip"
This reverts commit 9eaeb56c24.

Test: none
Bug: 119412419
2018-12-14 11:49:55 -08:00
Colin Cross
10846f99fb Revert "Correctly create directories before unzipping dexpreopt zip"
This reverts commit 2bb1f518fd.

Test: none
Bug: 119412419
2018-12-14 11:49:55 -08:00
Tom Cherry
0377f12108 Add owners for fs_config
Test: n/a
Change-Id: I3f81216444240acfbc86c3ef5c21e142107eb044
2018-12-14 10:55:29 -08:00