Anton Hansson
00cec79600
[automerger skipped] Remove embedded.mk
...
am: d88565085c
-s ours
Change-Id: I5592599a3c4e4ac7e3f30b029dee124ec605812e
2018-06-19 01:35:33 -07:00
Anton Hansson
631d0f8f3f
Merge "Remove embedded.mk" into stage-aosp-master
2018-06-19 08:26:26 +00:00
Anton Hansson
bd9b116bfc
Merge "Remove embedded.mk" into pi-dev-plus-aosp
2018-06-19 08:25:48 +00:00
Kevin Chyn
aeedd0b78b
Added android.hardware.biometrics.face to VNDK
...
Test: Builds
Bug: 110385761
Change-Id: I2ac7c79fff11467efcb93d1a69f052b80dc40637
2018-06-18 23:19:26 -07:00
nelsonli
3ef8fb312d
Merge "Build System: fix autogen_test_config problem" am: 2a07d562ac
am: be3c2116cd
...
am: 5566ce97fd
Change-Id: I6dd11a08e5766762f35d0f04dccc8e9e04dfb98a
2018-06-18 18:30:21 -07:00
nelsonli
5566ce97fd
Merge "Build System: fix autogen_test_config problem" am: 2a07d562ac
...
am: be3c2116cd
Change-Id: I39d1fc06d73f469d31bb39c2d196f0b7e935151c
2018-06-18 18:23:39 -07:00
nelsonli
be3c2116cd
Merge "Build System: fix autogen_test_config problem"
...
am: 2a07d562ac
Change-Id: Ic912fce62033b9d7b59c0b92630fc2206d9f3c77
2018-06-18 18:19:13 -07:00
Treehugger Robot
2a07d562ac
Merge "Build System: fix autogen_test_config problem"
2018-06-19 01:09:17 +00:00
TreeHugger Robot
71f2668795
Merge "atest: switch from a shell function to binary"
2018-06-19 00:18:20 +00:00
Weilun Du
2a47398ed8
Merge "Increase system image size to 2.5 GB" into pi-dev am: bd141d36a0
...
am: dfe622a1ef
Change-Id: I44690d60e40cd356fc3af638122b5e8b383d3a79
2018-06-18 16:29:12 -07:00
Android Build Merger (Role)
76a6b59a01
[automerger] Merge "Increase system image size to 2.5 GB" into pi-dev am: bd141d36a0
am: 67f8068329
...
Change-Id: Id20cae4096cbe742a4bdc8b8154400b1d84aa43c
2018-06-18 23:24:33 +00:00
Weilun Du
dfe622a1ef
Merge "Increase system image size to 2.5 GB" into pi-dev
...
am: bd141d36a0
Change-Id: I28c9f05314f7ce00969c45a03863f52a8d68b3a4
2018-06-18 16:23:59 -07:00
Weilun Du
67f8068329
Merge "Increase system image size to 2.5 GB" into pi-dev
...
am: bd141d36a0
Change-Id: Ib60435471bf2f6200453912ede81ee4730ed9758
2018-06-18 16:23:55 -07:00
Weilun Du
bd141d36a0
Merge "Increase system image size to 2.5 GB" into pi-dev
2018-06-18 23:11:40 +00:00
Dan Willemsen
2248e18f20
Merge "Restrict / from module names" am: eb0a09acf3
am: e89f54c0dd
...
am: 90788e8caa
Change-Id: Ifbaa4c561784b140863c8e358febc23bbafa82af
2018-06-18 16:11:06 -07:00
Dan Willemsen
90788e8caa
Merge "Restrict / from module names" am: eb0a09acf3
...
am: e89f54c0dd
Change-Id: I9ea108866e2b40934269923e6c8185ed5090b56d
2018-06-18 16:03:54 -07:00
Dan Willemsen
e89f54c0dd
Merge "Restrict / from module names"
...
am: eb0a09acf3
Change-Id: I840b8d8efe35858121e7fcf4eef6e6da23a4b63f
2018-06-18 15:58:44 -07:00
Dan Willemsen
eb0a09acf3
Merge "Restrict / from module names"
2018-06-18 22:44:44 +00:00
Makoto Onuki
da97106284
Envsetup: Add way to skip installing completions
...
Skip installing completion if ENVSETUP_NO_COMPLETIONS is set to 1.
Test: Following command with debug log added:
$ ENVSETUP_NO_COMPLETION=adb:fastboot:bit . build/envsetup.sh -> no completion installed
$ ENVSETUP_NO_COMPLETION=adb . build/envsetup.sh -> adb completion isn't installed
$ ENVSETUP_NO_COMPLETION=a . build/envsetup.sh -> all completions installed
$ ENVSETUP_NO_COMPLETION=fastboot . build/envsetup.sh -> fastboot completion isn't installed
Change-Id: I9f907585a1d2413f55ffcb6c7c01e49d1b55a3e0
2018-06-18 15:35:40 -07:00
Colin Cross
2d61e47f88
Revert "Revert "Inject minSdkVersion from the build system""
...
This reverts commit 4cd1a75d17
.
PackageParser no longer treats minSdkVersion=Q as targetSdkVersion=Q
when targetSdkVersion is set to a number.
Bug: 110167203
Bug: 110353795
Change-Id: Ib44743e4c49e59cd29a57af1bf885090e380b1b6
2018-06-18 20:18:37 +00:00
Adam Seaton
7e4dfa30fb
[automerger skipped] [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August Bug:109889880 am: f6bee62b8e
-s ours am: f53de93711
...
am: 4c883c7ab9
-s ours
Change-Id: I99dc31d84bd6663eaed4e0c00505e96902eab545
2018-06-18 13:04:46 -07:00
Adam Seaton
4c883c7ab9
[automerger skipped] [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August Bug:109889880 am: f6bee62b8e
-s ours
...
am: f53de93711
Change-Id: I7c4eaa1eb2eb0715be414239fd2b78c9aa92c772
2018-06-18 12:59:05 -07:00
Android Build Merger (Role)
0ffc906968
[automerger skipped] [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August Bug:109889880 am: f6bee62b8e
-s ours am: f53de93711
skipped: 6b57f1f8ba
...
Change-Id: I640db663644c51103d84f25e0af4480464f97b0e
2018-06-18 19:57:26 +00:00
Adam Seaton
6b57f1f8ba
[automerger skipped] [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August Bug:109889880 am: f6bee62b8e
-s ours
...
am: f53de93711
Change-Id: I76308bdc878526ae9e914a60786a29c49d1dae51
2018-06-18 12:57:02 -07:00
Adam Seaton
f53de93711
[automerger skipped] [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August Bug:109889880
...
am: f6bee62b8e
-s ours
Change-Id: Ib4f9aecf86cbf659a9a27d07fd03c7a799518e0e
2018-06-18 12:52:43 -07:00
Colin Cross
87dedf24c5
Merge "Revert "Inject minSdkVersion from the build system"" am: 71c0434af2
am: 8a607610a4
...
am: c4410d87ac
Change-Id: Ic87d8e2f11fe327e1167374a37502bcf6718e0fe
2018-06-18 12:39:19 -07:00
Colin Cross
c4410d87ac
Merge "Revert "Inject minSdkVersion from the build system"" am: 71c0434af2
...
am: 8a607610a4
Change-Id: If55ba9aface2e74a131b6cddec484760e3b8ba09
2018-06-18 12:20:56 -07:00
Colin Cross
8a607610a4
Merge "Revert "Inject minSdkVersion from the build system""
...
am: 71c0434af2
Change-Id: I2391acfcc34b25865c9428ce90862a82979999fa
2018-06-18 11:52:44 -07:00
Colin Cross
71c0434af2
Merge "Revert "Inject minSdkVersion from the build system""
2018-06-18 18:35:41 +00:00
Colin Cross
4cd1a75d17
Revert "Inject minSdkVersion from the build system"
...
This reverts commit fae93680fa
.
Bug: 110167203
Bug: 110353795
Change-Id: I14c71aec5a54ef055fc8d2b3560754c81f3d68ba
2018-06-18 18:35:00 +00:00
Makoto Onuki
8ec37dd235
atest: switch from a shell function to binary
...
Test: m -j, do envsetup.sh in a clean shell, run atest
Change-Id: I868d24176538397a592d20a4d5082170b91c9ae4
2018-06-18 10:50:55 -07:00
Adam Seaton
f6bee62b8e
[DO NOT MERGE] Update Platform Security String to 2018-08-05 for August
...
Bug:109889880
2018-06-18 17:28:17 +00:00
Anton Hansson
d88565085c
Remove embedded.mk
...
The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.
The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.
There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.
Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I35c05973dfefefb7a31686476215386b8b89a557
2018-06-18 11:54:25 +00:00
Anton Hansson
22a70c4379
Remove embedded.mk
...
The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.
The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.
There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.
Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
2018-06-18 12:50:31 +01:00
Weilun Du
31b2f7e57f
Increase system image size to 2.5 GB
...
Fixed build breakge caused by insufficient image size.
BUG: 110198136
Change-Id: I12a4a43b522b7867ff789854cf5b76d13f2f5499
Signed-off-by: Weilun Du <wdu@google.com >
2018-06-17 15:37:53 -07:00
Dan Willemsen
ac92659e0f
Restrict / from module names
...
Since this is a directory separator, it causes a good deal of
strangeness in the build whenever we include a module name in a path.
It becomes particularly problematic if used together with ".."
Test: build_test on downstream branches
Change-Id: I344eca0db3346cd6ffabff767c34159c85ebc051
2018-06-16 14:15:50 -07:00
Colin Cross
16f1dbc43c
Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests
...
Pass LOCAL_STATIC_ANDROID_LIBRARIES to ManifestMerger, and copy
manifests for prebuilts AARs and static android libraries to
$(intermediates.COMMON)/manifest/AndroidManifest.xml.
Bug: 78447299
Test: m java
Change-Id: I02ac29d3445fcd591101ff0ce215e60dd0997224
Merged-In: I02ac29d3445fcd591101ff0ce215e60dd0997224
Merged-In: Ib20aa4849978283f1da1ce601b28199fc0183e05
2018-06-16 07:55:41 -07:00
Anton Hansson
ba4de3e2c0
Merge "Remove core.mk." into pi-dev-plus-aosp
...
am: 9dd9173046
Change-Id: I302efd071629af40c306f6a813f0b23d30ba0981
2018-06-16 03:50:28 -07:00
Anton Hansson
9dd9173046
Merge "Remove core.mk." into pi-dev-plus-aosp
2018-06-16 10:37:40 +00:00
Colin Cross
28afe0f4a2
Merge "Inject minSdkVersion from the build system" am: 500fccebf7
am: e3ecbd521a
...
am: 2d48593d8b
Change-Id: I488c44336c95dbceaf94b04df63a4fecdcc62158
2018-06-15 23:47:13 -07:00
Colin Cross
2d48593d8b
Merge "Inject minSdkVersion from the build system" am: 500fccebf7
...
am: e3ecbd521a
Change-Id: I12db4bb8b7ed705d2c8e975fc4c7f62cd765301b
2018-06-15 22:59:17 -07:00
Colin Cross
e3ecbd521a
Merge "Inject minSdkVersion from the build system"
...
am: 500fccebf7
Change-Id: I5a9ab05278e8eca255f093f930b8c8913f4ddb91
2018-06-15 22:42:36 -07:00
Colin Cross
500fccebf7
Merge "Inject minSdkVersion from the build system"
2018-06-15 22:53:52 +00:00
Isaac Chen
84d020b14c
Merge "Set proper CPU variant for aosp_arm" am: 7f0ac95d21
am: bd3c40a051
...
am: 11f0b07c4f
Change-Id: I10e7d80362ec4fcd825f324b7bc470101f93fb2a
2018-06-15 15:24:42 -07:00
Isaac Chen
11f0b07c4f
Merge "Set proper CPU variant for aosp_arm" am: 7f0ac95d21
...
am: bd3c40a051
Change-Id: I0764aa8ab7ca6735a52be240510b9f05bca3643b
2018-06-15 14:58:12 -07:00
Isaac Chen
bd3c40a051
Merge "Set proper CPU variant for aosp_arm"
...
am: 7f0ac95d21
Change-Id: I4708367ced78703ef7b7df08a3f248d7136b06bd
2018-06-15 14:09:37 -07:00
Colin Cross
7351909619
Merge "Add LOCAL_DONT_MERGE_MANIFESTS" am: 5d80834b32
am: 663d8eea04
...
am: 9cddc25545
Change-Id: I34038c531d2ba7e601de62ea4c3c0e261077cee4
2018-06-15 13:45:03 -07:00
Colin Cross
5b9899afd7
[automerger skipped] Merge "Move merged AndroidManifest.xml file to manifest subdirectory" am: c11f2ff4d5
-s ours am: e41998c124
-s ours
...
am: 9a5b4fd718
-s ours
Change-Id: Ib253de1abac2ca0805477127eb4b9894deb79c5c
2018-06-15 13:42:25 -07:00
Treehugger Robot
7f0ac95d21
Merge "Set proper CPU variant for aosp_arm"
2018-06-15 20:19:10 +00:00
Colin Cross
9cddc25545
Merge "Add LOCAL_DONT_MERGE_MANIFESTS" am: 5d80834b32
...
am: 663d8eea04
Change-Id: I202a9f3eed141be804d1d95bf78d98a26850c927
2018-06-15 12:28:29 -07:00