Commit graph

48960 commits

Author SHA1 Message Date
Anton Hansson
ee4c970eb0 System-specific product sysprops
This change makes it possible for products to specify the values
of the ro.product.system.X sysprops independently from the
corresponding sysprops on the other partitions.

Leave the fingerprint as-is for now. It will be changed to follow
suit in a followup change.

Bug: 110206836
Test: make
Change-Id: Id30012e1948df792778b102203116d4ae3f68e56
2019-03-12 18:03:44 +00:00
Anton Hansson
ef0b949be3 Rename DEVICE arg in common buildprops script
A followup change will make it not always equal TARGET_DEVICE,
so that name is unsuitable. Make its name follow the other product
variables.

Bug: 110206836
Test: presubmit
Change-Id: Icb1422ec5e7af658c5cc3070993c472e99805c6b
2019-03-12 18:03:23 +00:00
Daniel Norman
cf9509df01 Merge "Adds support for optional config files to configure the merge." 2019-03-12 16:53:31 +00:00
Daniel Norman
2c99c5bbd2 Adds support for optional config files to configure the merge.
Bug: 124467065
Test: Running `python merge_target_files.py` using the three new flags
and observing that their contents are passed to the merge_target_files() function.
Change-Id: I4de46f041f5ae8bc8be2730313ce873a952bf78e
2019-03-12 16:51:18 +00:00
Remi NGUYEN VAN
c6bf520424 Merge "Move NetworkStack in-process from lib to APK" 2019-03-12 01:37:26 +00:00
Treehugger Robot
8924400a8a Merge "Revert "Build System: Solve dependency problem for test"" 2019-03-11 20:45:17 +00:00
Treehugger Robot
b6f2f8b2d9 Merge "releasetools: Add compatibility for custom out directory." 2019-03-11 19:51:14 +00:00
The Android Open Source Project
9205ecdbba DO NOT MERGE - Merge PPRL.190305.001 into master
Bug: 127812889
Change-Id: I174b936518b6fd2a7687f200478fd63b09bfb860
2019-03-11 11:13:56 -07:00
Nelson Li
6fe7f194b9 Revert "Build System: Solve dependency problem for test"
This reverts commit 224e103308.

Reason for revert: Build Breakage in git_pi-dev-plus-aosp/docs @5366136
make -j110 docs showcommands dist DIST_DIR=/buildbot/dist_dirs/git_pi-dev-plus-aosp-linux-docs/5366136 checkbuild
FAILED:
 Dependencies in out found with no rule to create them:
 out/target/product/generic/data/app/CtsVerifierTester/CtsVerifierTester.apk
 out/target/product/generic/data/app/TradeFedTestApp/TradeFedTestApp.apk
 out/target/product/generic/data/app/TradeFedUiTestApp/TradeFedUiTestApp.apk
 15:53:46 stopping
and
make -j50 showcommands dist TARGET_PRODUCT=cf_x86_phone DIST_DIR=/buildbot/dist_dirs/git_master-linux-ndk_translation_all/5366149 ndk_translation_all
FAILED: ninja: 'out/target/product/vsoc_x86/data/nativetest/arm/arm_insn_tests_arm_static/arm_insn_tests_arm_static', needed by 'out/target/product/vsoc_x86/obj/PACKAGING/ndk_translation_tests_intermediates/arm_insn_tests_arm_static_result.xml', missing and no known rule to make it
15:55:38 ninja failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: Idf95ef2e06526a0a31690420c923207db627605f
2019-03-11 16:48:29 +00:00
Pavel Salomatov
3267655004 releasetools: Add compatibility for custom out directory.
sign_target_files_apks script looks for the signapk.jar inside the out dir.
If the our dir is set to a different directory via OUT_DIR_COMMON_BASE the script does not work properly.

From now script checks if the OUT_DIR_COMMON_BASE is set, then searches the jar in the proper path.
If OUT_DIR_COMMON_BASE is unset, searches in "out" like it did before.

Test: Build with OUT_DIR_COMMON_BASE set and unset and verify that sign_target_files_apks works in both cases

Change-Id: I9218b98ff79526184f8353705640193405afac9e
2019-03-11 19:22:29 +03:00
Treehugger Robot
bc1e820f25 Merge "Fix some system property missing problem on aosp_* targets" 2019-03-11 16:10:22 +00:00
Treehugger Robot
15e76e3848 Merge "Build System: Solve dependency problem for test" 2019-03-11 15:18:12 +00:00
android-build-team Robot
0b004435b8 Make change and version bump to PPRL.190305.001
Change-Id: I406ab6822fab34684fdbc84ad264106ae3dbec3b
2019-03-08 18:53:29 +00:00
Treehugger Robot
b82b26456b Merge "Add a flag to select the apex boot image for preopt." 2019-03-08 17:33:51 +00:00
Nicolas Geoffray
19abe716f8 Add a flag to select the apex boot image for preopt.
Test: m && check that odex files are preopted with the apex image
Bug: 119800099
Change-Id: I5b64261cd765b511ad7e1ff513b85c0579023f6e
2019-03-08 14:41:14 +00:00
SzuWei Lin
ace19f63fe Fix some system property missing problem on aosp_* targets
Some PRODUCT_PROPERTY_OVERRIDES has no effect, ex.
ro.dalvik.vm.native.bridge=0 in runtime_libart.mk,
because gsi_common.mk uses ':=', not '+='.

Bug: 125829345
Test: build aosp_arm64-userdebug
Test: check the properties in /vendor/build.prop
Change-Id: Ib5e026069e7919fed8a00f905f3dbaa15042107f
2019-03-08 18:16:54 +08:00
Remi NGUYEN VAN
e6fcb468d8 Move NetworkStack in-process from lib to APK
This makes the in-process configuration closer to the "standard" module
configuration, by using an APK in both cases, but making sure that
svelte builds use an in-process service to avoid the memory impact.

Bug: 127908503
Test: svelte build boots and has functional WiFi
Change-Id: I59f44df7c23a24429e9fe6be034260373e33a994
2019-03-08 17:42:59 +09:00
Treehugger Robot
04f2896c88 Merge "Fix m snod" 2019-03-08 07:59:33 +00:00
Dan Willemsen
c478ea3dac Fix m snod
Whenever we're not loading all makefiles, we shouldn't be checking that
all the host packages exist.

Test: m snod
Change-Id: If1f817d855cbe329b83caee9fdd68c2cce55f02b
2019-03-07 17:18:15 -08:00
Dan Willemsen
066da0c58b Merge changes from topic "HOST_PACKAGES"
* changes:
  Build everything in PRODUCT_HOST_PACKAGES
  Reland "First pass at creating PRODUCT_HOST_PACKAGES"
2019-03-08 00:21:01 +00:00
Tri Vo
9f18c64d07 Merge "recovery: install product_file_contexts and product_property_contexts" 2019-03-07 18:32:48 +00:00
Tao Bao
28a11ef040 Merge "releasetools: Include retrofit info into package metadata." 2019-03-07 18:11:30 +00:00
nelsonli
224e103308 Build System: Solve dependency problem for test
1. A test can add a runtime dependent test module by just setting
   LOCAL_REQUIRED_MODULES or LOCAL_TARGET_REQUIRED_MODULES. Then the dependent test
   module will be copied to testcase folder.
2. Do not install to $(TARGET_OUT_DATA) for testcase

BUG: 117224272

Test: 1. (a) vi cts/tests/tests/text/Android.mk
         (b) add LOCAL_REQUIRED_MODULES := CtsPrintTestCases
         (c) m -j CtsTextTestCases
         (d) Then, CtsPrintTestCases should also be built to testcase folder like below.
             ./target/product/generic_arm64/testcases/CtsPrintTestCases

Change-Id: I24ea3783486c54a05cfa9d3d0375b977afc230f8
2019-03-07 14:08:35 +08:00
Treehugger Robot
fa2e796ce2 Merge "Remove logical partitions from ab_partitions.txt in retrofit package." 2019-03-07 01:06:42 +00:00
Tao Bao
393eeb4918 releasetools: Include retrofit info into package metadata.
Fixes: 126754990
Test: Generate retrofit and non-retrofit OTAs. Check the package
      metadata entry.
Test: python -m unittest test_ota_from_target_files
Change-Id: I076a013a6224a2ffea8e0b8581890b66f847f165
2019-03-06 16:19:11 -08:00
Dan Willemsen
b952b5e4c3 Build everything in PRODUCT_HOST_PACKAGES
This should only add extra host packages that were in
PRODUCT_HOST_PACKAGES and not PRODUCT_PACKAGES.

That shouldn't be very many things -- user builds will build a few more
host tools that used to be in PRODUCT_PACKAGES_DEBUG, etc.

Test: treehugger
Change-Id: I6768b76db74ea049de90eef326d1e314eb4ef848
Merged-In: I6768b76db74ea049de90eef326d1e314eb4ef848
2019-03-06 15:41:19 -08:00
Dan Willemsen
3d05a08a6f Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
Merged-In: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-06 14:46:06 -08:00
Yifan Hong
b433eba6a6 Remove logical partitions from ab_partitions.txt in retrofit package.
For retrofit updates:
ab_partitions -= dynamic_partition_list
ab_partitions += super_block_devices

For example,
if super_block_devices == ["system", "vendor", "odm"] and
   dynamic_partition_list == ["system", "vendor", "product"],
product partition needs to be removed from ab_partitions.txt
otherwise brillo_update_payload will generate a payload with
product partition in it.

Test: retrofit update that adds a partition
Fixes: 127425410

Change-Id: Id79a410cee3c611ac50d27f14282916aea34f938
2019-03-06 13:35:20 -08:00
Colin Cross
e34ff5ca5d Merge "Update manifest merger to use binary" 2019-03-04 22:02:09 +00:00
Tao Bao
2173bc1cf2 Include charger.recovery for recovery.
It used to be installed to recovery with the rsync from normal root to
recovery root.

Bug: 114042635
Test: `m -j bootimage` with aosp_walleye-userdebug.
Change-Id: If3451f21018f271b1df83a31d4ece382e0dfebb9
2019-03-04 11:46:29 -08:00
Nicolas Geoffray
53cfd9275b Merge "Pass the --api-flags to appcompat explicitly." 2019-03-04 14:14:39 +00:00
Julien Desprez
20a50f75a3 Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options" 2019-03-02 00:44:54 +00:00
Treehugger Robot
9da3b4c6f3 Merge "Clean up libjdwp.so and possibly other dependencies that might have crept in between http://r.android.com/890494 and http://r.android.com/913898." 2019-03-01 22:59:08 +00:00
Martin Stjernholm
6fd16926b1 Clean up libjdwp.so and possibly other dependencies that might have crept in
between http://r.android.com/890494 and http://r.android.com/913898.

(Repopulating libs from intermediates is quick, so not wasting effort trying
to be precise.)

Test: Don't have a suitably old build tree to test with.
Bug: 124498388
Change-Id: Ice35606e4c301d5b01837963137421f9d23a9733
2019-03-01 20:41:52 +00:00
Julien Desprez
4e9a9485f4 Add a placeholder EXTRA_OPTIONS to inject more tradefed options
Simply remove the placeholder in makefiles, for now I am
not sure we need to support this in makefiles at all.

Test: call the sed method
Bug: 124024827
Change-Id: Iae78ae86c20c5da6b7314b749f54983a312c4a7d
2019-03-01 11:36:36 -08:00
Yifan Hong
5a4696e460 Merge "Build ODM manifests and fragments for each SKU." 2019-03-01 18:32:32 +00:00
Anton Hansson
e0ce6ca8a5 Merge "Move BoardConfig strip / READONLY marking" 2019-03-01 15:34:36 +00:00
Anton Hansson
451951c139 Merge "Move combo makefile parsing" 2019-03-01 15:34:19 +00:00
Colin Cross
5852c93585 Merge "Use flags from Soong for d8 and r8" 2019-03-01 15:28:29 +00:00
Anton Hansson
d488d2d7d7 Move BoardConfig strip / READONLY marking
This moves the BoardConfig READONLY marking being product.mk's
responsibility to board_config.mk.

Also unify it with the BUILD_BROKEN_* setting handling, and
READONLY a few additional variables.

Test: build_test
Change-Id: Ifcfef588aa459223d6d7f017413d1681f341297f
2019-03-01 10:04:18 +00:00
Anton Hansson
192798513e Move combo makefile parsing
These files may be setting variables usually defined in the
BoardConfig. This moves that setting into board_config.mk so
that the relevant variables can be made readonly.

Test: build_test
Test: diff presubmit target_files vs base cl
Change-Id: I4dab09fa67c0f2e88a8ce1402a35b4ef5f8a0560
2019-03-01 09:54:33 +00:00
Logan Chien
b1c11de3c1 Fix check_elf_file with LOCAL_SDK_VERSION and NDK libs
This commit fixes prebuilt ELF checker for modules with
LOCAL_SDK_VERSIONS and depend on NDK shared libraries. This fix is
required because dynamic_binary.mk filters out NDK libraries thus those
libraries do not show up in DEPENDENCIES_ON_SHARED_LIBRARIES.

Bug: 119084334
Test: Create a prebuilt module with LOCAL_SDK_VERSION and check whether
      the NDK libs in LOCAL_SHARED_LIBRARIES are passed to
      check_elf_file.py.
Change-Id: I0f72ae1b0edc3e8d7e43eb70829e74d606564966
2019-03-01 10:25:25 +08:00
Treehugger Robot
1b9a0c8f7d Merge "Remove libnpt from system again." 2019-03-01 02:23:50 +00:00
Nicolas Geoffray
ac1f90c39c Pass the --api-flags to appcompat explicitly.
Bug: 125794065
Test: m && appcompat logs contain data
Change-Id: Idef875138d6670efc9ed7b9c63f653229b173d3e
2019-02-28 13:51:14 +00:00
Anton Hansson
c651ef8529 Merge "Make it an error to specify the wrong ARCH_VARIANT" 2019-02-28 10:29:05 +00:00
Anton Hansson
67d3081d3f Merge "Move WITH_DEXPREOPT default value" 2019-02-28 10:26:31 +00:00
Anton Hansson
2507ce486d Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant" 2019-02-28 10:26:18 +00:00
Anton Hansson
d265f52005 Merge "Consolidate some BoardConfig variable checks" 2019-02-28 09:21:41 +00:00
Martin Stjernholm
616dc79043 Remove libnpt from system again.
http://r.android.com/914573 fixes libjdwp to look for it in the APEX.

Test: Flash and boot
Test: adb forward tcp:5555 jdwp:`adb shell pidof com.android.email` && jdb -attach localhost:5555
Test: atest CtsJdwpTestCases
Bug: 124498388
Change-Id: Idf380660a21c88969e42d6a03a6b50fd2baa4c17
2019-02-27 20:51:56 +00:00
Anton Hansson
be1f9cb2fa Make it an error to specify the wrong ARCH_VARIANT
It was previously a warning to set an incorrect ARCH_VARIANT
when CPU_VARIANT was set to a cpu for which we knew the arch.

Make it an error, as there are no offenders in the tree.

Re-structure the code to make it a little clearer when you get
a default and when you get an error.

Test: build_test
Change-Id: I5821a8162a59e8c2aed2370068f9eb656ced9d99
2019-02-27 17:27:16 +00:00