Commit Graph

45828 Commits

Author SHA1 Message Date
Dan Willemsen
14e1026372 Fix PHONY uses found by --warn_real_to_phony
Switch a use of `ndk` to the timestamp file that `ndk` depends on
itself.

Mark more module-specific rules as PHONY.

Test: diff build-aosp_arm.ninja (stripping _kati_always_build_)
Test: Turn on --warn_real_to_phony for Kati, see fewer warnings
Change-Id: I101ced4067780e38d18820f5d916596429087e49
2018-06-19 09:26:58 -07:00
Dan Willemsen
649311868c Fix vndk packaging to stop depending on phony targets
These had been depending on the phony target for the library
(liblz4.vendor), not the actual built file and notice file.

Since we hadn't been saving the NOTICE file, and were only assuming the
installed notice file path. save that away for use during packaging.

Test: m vndk; diff out/target/product/generic/android-vndk-aosp_arm.zip
Test: m vndk; diff out/target/product/generic_arm64/android-vndk-aosp_arm64.zip
Change-Id: If9a4bed27030b7bd464cd3987739df94d32a0037
2018-06-19 09:26:58 -07:00
Anton Hansson
dbe194f472 Delete core_tiny.mk
Only inherited by a single mk, so inline its contents there, with a few
exceptions:
- pppd was redundant (already in base)
- ContactsProvider and DefaultContainerService were duped in base.mk's
  only two children (core_tiny and core_minimal)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-19 14:01:10 +00:00
Anton Hansson
552dcaf7d9 Delete core_tiny.mk
Only inherited by a single mk, so inline its contents there, with a few
exceptions:
- pppd was redundant (already in base)
- ContactsProvider and DefaultContainerService were duped in base.mk's
  only two children (core_tiny and core_minimal)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-19 14:57:39 +01:00
Anton Hansson
e97125f5b7 Delete core_tiny.mk
Only inherited by a single mk, so inline its contents there, with a few
exceptions:
- pppd was redundant (already in base)
- ContactsProvider and DefaultContainerService were duped in base.mk's
  only two children (core_tiny and core_minimal)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-19 14:29:34 +01:00
Anton Hansson
78b82bd8b6 [automerger skipped] Merge "Remove embedded.mk" am: f16031cfec -s ours am: 626237371a -s ours
am: f83be2750d  -s ours

Change-Id: Ieb7860d08f11ddafdc3aa041556e4cf8710a00ef
2018-06-19 05:56:02 -07:00
Anton Hansson
f83be2750d [automerger skipped] Merge "Remove embedded.mk" am: f16031cfec -s ours
am: 626237371a  -s ours

Change-Id: Ic2b0ade7f800dd08f98d85eba5294c7c34fa577a
2018-06-19 05:52:12 -07:00
Anton Hansson
626237371a [automerger skipped] Merge "Remove embedded.mk"
am: f16031cfec  -s ours

Change-Id: Ibad0249947d7868013f257ab727455cecf66228a
2018-06-19 05:49:02 -07:00
Anton Hansson
f16031cfec Merge "Remove embedded.mk" 2018-06-19 12:44:59 +00:00
Anton Hansson
d0288a12be [automerger skipped] Merge "Remove embedded.mk" into stage-aosp-master am: 631d0f8f3f -s ours
am: 3de14e64dc  -s ours

Change-Id: Ia0a051b1c5b55bab86b60576c2ddf3933624b31b
2018-06-19 03:47:08 -07:00
Anton Hansson
30db416826 [automerger skipped] Remove embedded.mk am: d88565085c -s ours
am: 00cec79600  -s ours

Change-Id: I304651ef4ac89e7a002cf96151de551c4be7b4c4
2018-06-19 03:45:56 -07:00
Anton Hansson
32e70da517 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
Merged-In: I2e25032645c87f084f911e14fade16bc802ff457
2018-06-19 10:40:01 +00:00
Anton Hansson
50ae616915 resolve merge conflicts of bd9b116bfc to master
ag/4365985 got in the way

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2e25032645c87f084f911e14fade16bc802ff457
2018-06-19 10:47:52 +01:00
Anton Hansson
3de14e64dc [automerger skipped] Merge "Remove embedded.mk" into stage-aosp-master
am: 631d0f8f3f  -s ours

Change-Id: Ibb471ae35d483beb388e515e31484b2ce513ab7d
2018-06-19 01:36:17 -07:00
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
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
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