Commit Graph

18838 Commits

Author SHA1 Message Date
Colin Cross 3ecb9c4fdd Add a dependency on boot jars $(LOCAL_BUILT_MODULE)
After I25163e91886cea6941afa25cdb529ed053278dcb there is no longer
a dependency on $(LOCAL_BUILT_MODULE) for boot jars, as boot.art
is installed instead.  Add a dependency from boot.art to
$(LOCAL_BUILT_MODULE) so that $(LOCAL_BUILT_MODULE) and its
dependencies (which may include jacoco-report-classes.jar) is
copied for every build.

Fixes: 127702563
Test: forrest
Change-Id: I4db2d1f5fe2e1141fe93317cd7a2a58a33f8fbff
2019-03-18 13:17:22 -07:00
Yifan Hong 889b1f7c0c Allow disabling building super partition for DAP devices
Previously:
if (DAP && !BUILD_SUPER) error;

Now:
if (BUILD_SUPER && !DAP) error;

This allows DAP devices to disable building super partition when the OEM
doesn't want to. The ability to build super partition shouldn't be
a requirement of enabling DAP; rather, building super partition requires
DAP to be enabled.

To do this on a device, PRODUCT_BUILD_SUPER_PARTITION should be set
to false explicitly. If it is unset, it will use the value of
PRODUCT_USE_DYNAMIC_PARTITIONS.

Bug: 127687287
Test: set PRODUCT_BUILD_SUPER_PARTITION to false and build dist

Change-Id: I25f1866e61d73affb445c1aec042cf53aac93583
2019-03-18 11:48:03 -07:00
Anton Hansson b7ee86ff85 Refactor and further simplify the RRO logic
Make the runtime vs static resource overlays a little clearer.
This will help adding more logic around determining if an RRO
needs to be generated in /vendor, /product or both.

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: I43111a1d9bb3405c559faaef56a75a5ad7672ba0
2019-03-16 15:52:30 +00:00
Benjamin Gordon 9c676bb5a8 Merge "Add stoney ridge x86 variant" am: 8c2881034a
am: b3a6164a9b

Change-Id: Ief0e31de64b0bc9ccc7e11941a114241599f2aa4
2019-03-15 15:40:01 -07:00
Benjamin Gordon b3a6164a9b Merge "Add stoney ridge x86 variant"
am: 8c2881034a

Change-Id: I43d012b9755e593b3b5c34c88254b51b52f63201
2019-03-15 15:33:32 -07:00
Treehugger Robot 8c2881034a Merge "Add stoney ridge x86 variant" 2019-03-15 21:41:32 +00:00
Anton Hansson fd06b02b30 Add comments and slight refactor auto-RRO logic
Make it a bit clearer what this code is intended to do.

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: Ic405fc5d4601b9f0a91b4d24caa06f279267c51a
2019-03-15 17:03:53 +00:00
Roland Levillain 1f355b181d Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." am: dbfe39faa2
am: 0e0ffc1053

Change-Id: I91aa17f26b372b301386c880c2ec66821fe6ec6a
2019-03-14 06:36:55 -07:00
Roland Levillain 0e0ffc1053 Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS."
am: dbfe39faa2

Change-Id: I065fc822abc7b9dda99e1fc83ef32f07a47e8b3a
2019-03-14 06:31:45 -07:00
Roland Levillain dbfe39faa2 Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." 2019-03-14 13:17:46 +00:00
Bowgo Tsai ddac7dcce1 Sets default value of ro.postinstall.fstab.prefix
ro.postinstall.fstab.prefix might be either "/system" or "/product",
to decide the location of the fstab.postinstall, used to mount
system_other partition on A/B devices.

  {ro.postinstall.fstab.prefix}/etc/fstab.postinstall

Bug: 112103720
Test: factory reset and boot device, checks cppreopt logs

Change-Id: Ib1e282752c37713e2220239f4f903453ce3c8bab
2019-03-14 16:03:04 +08:00
Nelson Li fd71578493 Merge "Revert "Revert "Build System: Solve dependency problem for test""" am: 795721ac2a
am: 3c4c86943c

Change-Id: I735cae7b8d68db780eac51868a1ef0fd9b22c5e9
2019-03-13 21:39:07 -07:00
Nelson Li 3c4c86943c Merge "Revert "Revert "Build System: Solve dependency problem for test"""
am: 795721ac2a

Change-Id: Ic5a66836b748dbe18a5b67a55896a0ae041dfc6c
2019-03-13 21:34:55 -07:00
Treehugger Robot 795721ac2a Merge "Revert "Revert "Build System: Solve dependency problem for test""" 2019-03-14 04:23:32 +00:00
Nelson Li 1f8357fe7d Revert "Revert "Build System: Solve dependency problem for test""
This reverts commit 6fe7f194b9.

Reason for revert: Fixed all build break.

Change-Id: I0a4842df1225399752515a4cd7a7c14173a5bf7b
2019-03-14 01:05:36 +00:00
Yifan Hong 69e0d61cbe Add supernod build target.
superimage-nodeps and supernod depends
on images from $(ANDROID_PRODUCT_OUT) (not from
target files package). It doesn't rebuild source
images if they are present.

A typical workflow is:

    m -j
    # change code in system
    m snod -j
    m supernod -j

Test: For non retrofit, run:
      `m snod -j; m supernod -j`
Fixes: 128321505
Change-Id: Ib8c011cadb9c0cd334234aef39f19be6a48fee62
2019-03-13 11:15:21 -07:00
Roland Levillain 43d2ca50ea Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS.
These targets have been removed from ART Makefiles in 2018.

Test: n/a
Bug: 29282211
Bug: 77856586
Change-Id: I00ab00392d153242a67d0764e3ca2ba0528d79db
2019-03-13 17:28:11 +00:00
Xin Li a6d9bd539a Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" 2019-03-13 02:26:04 +00:00
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
Adam Seaton 11b19b2cd5 Merge "[DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951" into pi-dev
am: 53a4d16512

Change-Id: Iab27916732450121d68278e313a28f3507f3895f
2019-03-11 15:42:24 -07:00
Nelson Li 87a4a179e1 Merge "Revert "Build System: Solve dependency problem for test"" am: 8924400a8a
am: abc1617463

Change-Id: Ic24d4cc0fddbc85a273c3050a35a2d09b741fc18
2019-03-11 14:55:42 -07:00
Nelson Li abc1617463 Merge "Revert "Build System: Solve dependency problem for test""
am: 8924400a8a

Change-Id: Ie4a572a1e2d8ab31552b31897d3062c2b7953ce1
2019-03-11 14:21:37 -07:00
Elisa Pascual Trevino 21e7b04729 [DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev Bug: 128322951
am: 1159bb8b17

Change-Id: I6efcc5456bf46cf789c51fbcb87d8ffd15026f5f
2019-03-11 14:14:21 -07:00
Adam Seaton 7d44fc8d59 [DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev
Bug:128322951
2019-03-11 20:46:28 +00:00
Treehugger Robot 8924400a8a Merge "Revert "Build System: Solve dependency problem for test"" 2019-03-11 20:45:17 +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
Elisa Pascual Trevino 1159bb8b17 [DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev
Bug: 128322951
2019-03-11 17:58:20 +00: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
nelsonli 6e62c0bdaa Merge "Build System: Solve dependency problem for test" am: 15e76e3848
am: 740ac49c83

Change-Id: I770273ff9ad1e0444085d4222a692b7cb455041d
2019-03-11 08:30:24 -07:00
nelsonli 740ac49c83 Merge "Build System: Solve dependency problem for test"
am: 15e76e3848

Change-Id: I3196c19640d92e72f947c45925969845f63daeb4
2019-03-11 08:26:14 -07: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
Nicolas Geoffray c6b7b2cdae Merge "Add a flag to select the apex boot image for preopt." am: b82b26456b
am: e39cf6a200

Change-Id: I1e68ea0dc1b75216b4d1613b1db7425525dde71c
2019-03-08 10:16:19 -08:00
Nicolas Geoffray e39cf6a200 Merge "Add a flag to select the apex boot image for preopt."
am: b82b26456b

Change-Id: I36baf7040c04428f53fb373f7391ac5e0b65a4e0
2019-03-08 10:11:11 -08: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
Dan Willemsen 8933fed367 Merge "Fix `m snod`" am: 04f2896c88
am: 28ac0cd338

Change-Id: I21a95be55dd14d409ad734d495c43f91d4017ccd
2019-03-08 00:14:56 -08:00
Dan Willemsen 28ac0cd338 Merge "Fix `m snod`"
am: 04f2896c88

Change-Id: Ie752f16d4dbf576df3329d87612ac2f6b2ac638b
2019-03-08 00:11:07 -08:00
Dan Willemsen 283aa265d7 Merge changes from topic "HOST_PACKAGES" am: 066da0c58b
am: 75720c81aa

Change-Id: Id025085288ec317e035535819b701ba95b298bf7
2019-03-07 17:52:27 -08:00
Dan Willemsen e314eeb918 Reland "First pass at creating PRODUCT_HOST_PACKAGES" am: 3d05a08a6f
am: 87d763b9f4

Change-Id: Idccfb845dd73bff320d6593e736386125dd8e477
2019-03-07 17:51:34 -08: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 75720c81aa Merge changes from topic "HOST_PACKAGES"
am: 066da0c58b

Change-Id: I9600129b255f1ef16880a217aeeac60622aab571
2019-03-07 17:07:33 -08:00
Dan Willemsen 87d763b9f4 Reland "First pass at creating PRODUCT_HOST_PACKAGES"
am: 3d05a08a6f

Change-Id: Ifc134f514dbcfc28e33eb82b2a77514cc4af26b6
2019-03-07 17:06:23 -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 34f72c8e30 Merge "recovery: install product_file_contexts and product_property_contexts" am: 9f18c64d07
am: 6a03c1677b

Change-Id: Ib45350461ff21edcb42c65b089183bd157e945f2
2019-03-07 12:06:57 -08:00
Tri Vo 6a03c1677b Merge "recovery: install product_file_contexts and product_property_contexts"
am: 9f18c64d07

Change-Id: If303af03aed7453c4cacfba21b13debc2bd7dcff
2019-03-07 11:58:25 -08:00
Tri Vo 9f18c64d07 Merge "recovery: install product_file_contexts and product_property_contexts" 2019-03-07 18:32:48 +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
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
Colin Cross 51fea3d3b4 Merge "Update manifest merger to use binary" am: e34ff5ca5d
am: 9c6a64ea64

Change-Id: I40bcbe199fd4837eededddfa03069015b536f04b
2019-03-04 14:20:35 -08:00
Colin Cross 9c6a64ea64 Merge "Update manifest merger to use binary"
am: e34ff5ca5d

Change-Id: I0e10784282edb4394c192ffe5b177023d5d72832
2019-03-04 14:13:27 -08:00
Colin Cross e34ff5ca5d Merge "Update manifest merger to use binary" 2019-03-04 22:02:09 +00:00
Nicolas Geoffray 05cee18432 Merge "Pass the --api-flags to appcompat explicitly." am: 53cfd9275b
am: 40ccefa404

Change-Id: I73e4cc646241347a2df188a1a610d9effcc673c9
2019-03-04 06:27:48 -08:00
Nicolas Geoffray 40ccefa404 Merge "Pass the --api-flags to appcompat explicitly."
am: 53cfd9275b

Change-Id: I1bb503a1140c6d3877280c6073710bd9b5ffb61a
2019-03-04 06:23:38 -08:00
Nicolas Geoffray 53cfd9275b Merge "Pass the --api-flags to appcompat explicitly." 2019-03-04 14:14:39 +00:00
Julien Desprez 0e0ef29e9f Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options" am: 20a50f75a3
am: cab4032f3c

Change-Id: Idd4cd181e0106cb97c216385dd166211332cab10
2019-03-01 17:15:03 -08:00
Julien Desprez cab4032f3c Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options"
am: 20a50f75a3

Change-Id: Icf8f52e2aad12157daf3b967b6afa606dc7e0366
2019-03-01 17:00:15 -08: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 934174f0bd Merge "Build ODM manifests and fragments for each SKU." am: 5a4696e460
am: 9abd15f3c1

Change-Id: Iba0f554d1430962752f5fa6425f3ad671d2a99b2
2019-03-01 10:55:04 -08:00
Yifan Hong 9abd15f3c1 Merge "Build ODM manifests and fragments for each SKU."
am: 5a4696e460

Change-Id: I40c136830b1e0b433533c55499736a5ad979a039
2019-03-01 10:50:35 -08:00
Yifan Hong 5a4696e460 Merge "Build ODM manifests and fragments for each SKU." 2019-03-01 18:32:32 +00:00
Anton Hansson 79d283621c Merge "Move BoardConfig strip / READONLY marking" am: e0ce6ca8a5
am: 393de8744d

Change-Id: Ie82facbe1ea6562da45be25c69b5d379cec05853
2019-03-01 07:51:00 -08:00
Anton Hansson 7f98d99518 Merge "Move combo makefile parsing" am: 451951c139
am: 0eca386c7e

Change-Id: I7da8e40fbd20fd5b8076a38692e00269510db2d2
2019-03-01 07:49:27 -08:00
Colin Cross ecc4607403 Merge "Use flags from Soong for d8 and r8" am: 5852c93585
am: fb770b4f84

Change-Id: I83dc8fc74b03e8ef3a2e2bd9a6c42fd89c227301
2019-03-01 07:47:03 -08:00
Anton Hansson 393de8744d Merge "Move BoardConfig strip / READONLY marking"
am: e0ce6ca8a5

Change-Id: I469fe2d74ce5a89084bef4637b471afc4db1b8b4
2019-03-01 07:46:50 -08:00
Anton Hansson 0eca386c7e Merge "Move combo makefile parsing"
am: 451951c139

Change-Id: I9d7d4373abf5ebaa7d584f320433060aec8633e7
2019-03-01 07:42:26 -08:00
Colin Cross fb770b4f84 Merge "Use flags from Soong for d8 and r8"
am: 5852c93585

Change-Id: Iae764b89ba7a248e91b829144fd0d19796b773ef
2019-03-01 07:40:35 -08: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
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 c33384d895 Merge "Make it an error to specify the wrong ARCH_VARIANT" am: c651ef8529
am: 04d20252f9

Change-Id: I3b6ea3d9aeda8eaab02c4e7bc2cd1b8c2d7d75f3
2019-02-28 02:43:45 -08:00
Anton Hansson 04d20252f9 Merge "Make it an error to specify the wrong ARCH_VARIANT"
am: c651ef8529

Change-Id: I754ded4bfeb01e7c7be9034845fbb5fcb30f996d
2019-02-28 02:38:27 -08:00
Anton Hansson d3a8a46e3d Merge "Move WITH_DEXPREOPT default value" am: 67d3081d3f
am: 5141484847

Change-Id: I3f183c52d3d49213630ab004937e07efc6ba8faf
2019-02-28 02:36:34 -08:00
Anton Hansson 81651dcf2e Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant" am: 2507ce486d
am: 3df97964e6

Change-Id: I17373f5be911396cac35bcad649e35bc207d0062
2019-02-28 02:35:43 -08:00
Anton Hansson 5141484847 Merge "Move WITH_DEXPREOPT default value"
am: 67d3081d3f

Change-Id: I30bae8e8cd869ce564540565dec159b52ddc5d7e
2019-02-28 02:32:25 -08:00
Anton Hansson 3df97964e6 Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant"
am: 2507ce486d

Change-Id: Ia7757912af4bdeee6836df94619f6faa09bf8cc4
2019-02-28 02:31:34 -08: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 c20ea064d1 Merge "Consolidate some BoardConfig variable checks" am: d265f52005
am: 3f6e03334a

Change-Id: Ifbd2e3fc626a55ee6e20884676de1a46e7c999b9
2019-02-28 01:34:29 -08:00
Anton Hansson 3f6e03334a Merge "Consolidate some BoardConfig variable checks"
am: d265f52005

Change-Id: I805488439c08649e03a977d4d1a77e9d94b92d67
2019-02-28 01:30:20 -08:00
Anton Hansson d265f52005 Merge "Consolidate some BoardConfig variable checks" 2019-02-28 09:21:41 +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
Anton Hansson 74dc00b88f Move WITH_DEXPREOPT default value
This allows setting the variable READONLY after reading the BoardConfig.

This is safe to do because this flag is only set in BoardConfig.mk
files. The same is not true for many of the other default preopt flags,
like DEX_PREOPT_DEFAULT or WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
which are set in mixture of product / board config files.

Test: boot blueline
Change-Id: I961ba581f9790bcdc7cf6b36d8b53bcdb8861a92
2019-02-27 15:03:23 +00:00
Anton Hansson 72e36f0278 Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant
The current modification of the variable within the build system
prohibits making the variable readonly.

Test: build_test
Test: boot blueline
Change-Id: Iec6058a163b5951db389d4adc0d9d0397431efb1
2019-02-27 14:29:01 +00:00
Anton Hansson b9544694a5 Consolidate some BoardConfig variable checks
Move a few more variable stripping/sanity checking from
config.mk to board_config.mk

Test: build_test
Change-Id: I93fde7293de38398039dbb679b2399c8a68c190d
2019-02-27 14:07:43 +00:00
Anton Hansson a4306d0df9 Merge "Split out board_config.mk" am: 45747a037a
am: bff3401e7f

Change-Id: I287bdd429ca1a285b5d815fd0e1f07d51c857c47
2019-02-27 05:35:23 -08:00
Anton Hansson bff3401e7f Merge "Split out board_config.mk"
am: 45747a037a

Change-Id: Iebb38287c13ba6690b1535e61010cc1b235c7ce9
2019-02-27 05:32:13 -08:00
Anton Hansson 45747a037a Merge "Split out board_config.mk" 2019-02-27 13:21:17 +00:00
Colin Cross 7293c1e4b9 Update manifest merger to use binary
Manifest merger is now a java_binary instead of a collection of jars,
it can use the single binary as the dependency.

Bug: 112607039
Test: m checkbuild
Change-Id: Id97b01542314cb165ebf7c90409a09482d8c53bc
2019-02-27 06:18:35 +00:00
Yifan Hong 45d5ba6ce1 Merge "Fix dynamic partition size check for devices with recovery" am: 55ebd61486
am: d8da08795d

Change-Id: I77f449314639293c5148ba0beebd3fcb98f820ef
2019-02-26 18:29:36 -08:00
Yifan Hong d8da08795d Merge "Fix dynamic partition size check for devices with recovery"
am: 55ebd61486

Change-Id: I4dc34153bdad6b91d752785f187e5e2479061044
2019-02-26 18:20:17 -08:00
Treehugger Robot 55ebd61486 Merge "Fix dynamic partition size check for devices with recovery" 2019-02-27 01:58:58 +00:00
Anton Hansson bb76ce825c Split out board_config.mk
Similar to product_config.mk, this contains the logic for reading
BoardConfig.mk, and will be expanded to sanity-check variables
set in the BoardConfig etc.

Test: build_test
Change-Id: I4f8d7cfbf1506ae4268c82c9554680259958b313
2019-02-26 16:27:48 +00:00