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
TreeHugger Robot
00ff89e442
Merge "Change to configstore 1.1"
2019-03-01 06:39:43 +00:00
Martin Stjernholm
c62dcaf4e4
Merge "Remove libnpt from system again." am: 1b9a0c8f7d am: 6dddea74a3
...
am: e46f28cf7c
2019-02-28 19:03:38 -08:00
Martin Stjernholm
e46f28cf7c
Merge "Remove libnpt from system again." am: 1b9a0c8f7d
...
am: 6dddea74a3
2019-02-28 18:53:04 -08:00
Martin Stjernholm
6dddea74a3
Merge "Remove libnpt from system again."
...
am: 1b9a0c8f7d
2019-02-28 18:44:07 -08: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
c474edeaaf
Merge "Make it an error to specify the wrong ARCH_VARIANT" am: c651ef8529 am: 04d20252f9
...
am: c33384d895
2019-02-28 02:47:56 -08:00
Anton Hansson
c33384d895
Merge "Make it an error to specify the wrong ARCH_VARIANT" am: c651ef8529
...
am: 04d20252f9
2019-02-28 02:43:45 -08:00
Anton Hansson
d783c5bca9
Merge "Move WITH_DEXPREOPT default value" am: 67d3081d3f am: 5141484847
...
am: d3a8a46e3d
2019-02-28 02:41:00 -08:00
Anton Hansson
36784f93a2
Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant" am: 2507ce486d am: 3df97964e6
...
am: 81651dcf2e
2019-02-28 02:39:54 -08:00
Anton Hansson
04d20252f9
Merge "Make it an error to specify the wrong ARCH_VARIANT"
...
am: c651ef8529
2019-02-28 02:38:27 -08:00
Anton Hansson
d3a8a46e3d
Merge "Move WITH_DEXPREOPT default value" am: 67d3081d3f
...
am: 5141484847
2019-02-28 02:36:34 -08:00
Anton Hansson
81651dcf2e
Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant" am: 2507ce486d
...
am: 3df97964e6
2019-02-28 02:35:43 -08:00
Anton Hansson
5141484847
Merge "Move WITH_DEXPREOPT default value"
...
am: 67d3081d3f
2019-02-28 02:32:25 -08:00
Anton Hansson
3df97964e6
Merge "Modify INTERNAL_KERNEL_CMDLINE instead of BOARD_ variant"
...
am: 2507ce486d
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
6ad39ba0c0
Merge "Consolidate some BoardConfig variable checks" am: d265f52005 am: 3f6e03334a
...
am: c20ea064d1
2019-02-28 01:38:41 -08:00
Anton Hansson
c20ea064d1
Merge "Consolidate some BoardConfig variable checks" am: d265f52005
...
am: 3f6e03334a
2019-02-28 01:34:29 -08:00
Anton Hansson
3f6e03334a
Merge "Consolidate some BoardConfig variable checks"
...
am: d265f52005
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
Baligh Uddin
4b9a0cba72
Merge "Add ability to sign bundled APEX into device signing process."
2019-02-27 21:18:21 +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
Baligh Uddin
b3517c0d18
Add ability to sign bundled APEX into device signing process.
...
Bug: 123716522
Change-Id: I58a8b03e5a636338317302f254403c88dec61f8c
2019-02-27 12:00:40 -08: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
1167d36a18
Merge "Split out board_config.mk" am: 45747a037a am: bff3401e7f
...
am: a4306d0df9
2019-02-27 05:39:39 -08:00
Anton Hansson
a4306d0df9
Merge "Split out board_config.mk" am: 45747a037a
...
am: bff3401e7f
2019-02-27 05:35:23 -08:00
Anton Hansson
bff3401e7f
Merge "Split out board_config.mk"
...
am: 45747a037a
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
baff3dda9e
Merge "Fix dynamic partition size check for devices with recovery" am: 55ebd61486 am: d8da08795d
...
am: 45d5ba6ce1
2019-02-26 18:38:57 -08:00
Yifan Hong
45d5ba6ce1
Merge "Fix dynamic partition size check for devices with recovery" am: 55ebd61486
...
am: d8da08795d
2019-02-26 18:29:36 -08:00
Yifan Hong
d8da08795d
Merge "Fix dynamic partition size check for devices with recovery"
...
am: 55ebd61486
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
Ray Essick
2fa0b813a3
Merge "Remove libmediaplayerservice from base components"
2019-02-26 21:57:42 +00:00
Lingfeng Yang
fbae04c480
Merge "Add more space in the sdk image for an updated swiftshader" am: aa39d0bdbc am: 60928d7ea8
...
am: cdca859619
2019-02-26 08:34:50 -08:00
Lingfeng Yang
cdca859619
Merge "Add more space in the sdk image for an updated swiftshader" am: aa39d0bdbc
...
am: 60928d7ea8
2019-02-26 08:30:40 -08: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
Lingfeng Yang
60928d7ea8
Merge "Add more space in the sdk image for an updated swiftshader"
...
am: aa39d0bdbc
2019-02-26 08:26:31 -08:00
Lingfeng Yang
aa39d0bdbc
Merge "Add more space in the sdk image for an updated swiftshader"
2019-02-26 16:12:14 +00:00
Cody Schuffelen
45dd92e51b
Add more space in the sdk image for an updated swiftshader
...
Related change: aosp/907158.
Bug: 124530765
Test: TreeHugger
Change-Id: Id9313c3900dae90696101c83d04827d4ee5911bf
2019-02-26 00:21:17 -08:00
Bill Peckham
3a21cc6a50
Merge "Extract common.UnzipToDir, invoke that from merge_target_files.py" am: a2f536f9fa am: 0ea998133c
...
am: 5f2ae4e685
2019-02-25 22:25:12 -08:00
Dan Willemsen
8c979fa522
Merge "Deprecate *.c[pp].arm" am: fb8c9673e7 am: 5d340e1552
...
am: 662380e517
2019-02-25 22:08:32 -08:00
