Commit graph

215 commits

Author SHA1 Message Date
SzuWei Lin
2ccd37eeb3 Split *_product makefiles
So far, we have *_system.mk and *_vendor.mk.
This patch split all product settings from *_vendor.mk to new
*_product.mk

This patch also create a new telephony.mk to include all
telephony_*.mk

Bug: 119747870
Test: lunch mainline_arm64-user; make -j
Test: compare the content with and without the patch
Test: the output files in out folder are the same
Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a
2019-01-15 17:37:57 +08:00
Anton Hansson
3b5ec11625 Add a base.mk that includes all base.mk files.
Suitable for products that don't care about being split by partition.

Bug: 80410283
Test: make
Change-Id: I973e66823484c6871817bb85e8880e36a0ac2887
2018-06-26 18:08:31 +01:00
Anton Hansson
d172e0d51d Split base.mk into system and vendor parts.
Put all packages that end up on the vendor partition in a separate mk,
to allow creating products with artifact path requirements.

Bug: 80410283
Test: diff product vars with multiproduct_kati
Change-Id: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
2018-06-25 15:12:20 +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
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
TreeHugger Robot
71f2668795 Merge "atest: switch from a shell function to binary" 2018-06-19 00:18:20 +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
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
Anton Hansson
66a1b06432 Merge "Move a few packages from core_minimal.mk to base.mk." into pi-dev-plus-aosp
am: 7afb0b126b

Change-Id: I38e117f9872f9090b021ba3fc72b266e685da6d4
2018-06-15 02:06:07 -07:00
Anton Hansson
7afb0b126b Merge "Move a few packages from core_minimal.mk to base.mk." into pi-dev-plus-aosp 2018-06-15 08:57:57 +00:00
Sundong Ahn
9087c3cc89 Merge "Remove com.android.location.provider.xml" am: 1ce8617482 am: b4cb1b542a
am: e8fe5eb021

Change-Id: I99ba2453bd49b50bc0643f7cdd0889d39794fcd1
2018-06-14 22:20:13 -07:00
Sundong Ahn
b4cb1b542a Merge "Remove com.android.location.provider.xml"
am: 1ce8617482

Change-Id: I56c7f2d883b00812b92b43e318548bbba4855eb2
2018-06-14 21:52:54 -07:00
Anton Hansson
3eea079ecf Move a few packages from core_minimal.mk to base.mk.
All the products that inherit from base.mk add these packages, so moving
them up the hierarchy eliminates some duplication.

        DownloadProvider
        idmap
        libneuralnetworks
        mdnsd
        MediaProvider

Bug: 80410283
Test: diff all product variables with multiproduct_kati
Change-Id: I133a385b3bc64261d73f616c416f7a905675c09d
2018-06-14 16:40:04 +01:00
Sundong Ahn
8970f61d99 Remove com.android.location.provider.xml
The com.android.location.provider.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Change-Id: Idfbc6b09ca4337795277df8b98c73f6fd5865aff
2018-06-14 11:15:20 +09:00
Jiyong Park
df6a6dbbb9 Merge "Support shared library in recovery mode" am: 2371a7d60e am: 1d46a3395f
am: eed93f02c7

Change-Id: Id7c6db10f27f94bea2ad9f471fa987135048afb6
2018-06-13 17:46:18 -07:00
Jiyong Park
1d46a3395f Merge "Support shared library in recovery mode"
am: 2371a7d60e

Change-Id: I1e4520c8a2663476bd3924aeca1cf5183240dbf7
2018-06-13 16:38:49 -07:00
Jiyong Park
53acaeab0a Support shared library in recovery mode
The dyanmic linker and the linker config script for the recovery mode
(*.recovery variants) are added to PRODUCT_PACKAGES.

Also this removes the mountpoint /system_root from the recovery image as the
recovery image is self-contained and the real system image is mounted at
/mnt/system which is created automatically at runtime.

Bug: 63673171
Test: `adb reboot recovery; adb devices` shows the device ID
Test: Select 'mount /system' in the recovery mode, then `adb shell`.
$ lsof -p `pidof adbd` shows that libm.so, libc.so, etc. are loaded from
the /lib directory.

Change-Id: Ice6c75b0b81bb9be696aaff3e095d87f19278995
2018-06-14 02:03:57 +09:00
Anton Hansson
f42afaf2a2 resolve merge conflicts of 2ab7fe2fe5 to stage-aosp-master
BUG: None
Test: git diff origin/pi-dev-plus-aosp is empty
Change-Id: Ib99471ae197d753efeeb17be95edbd72326f1358
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-06-12 16:09:49 +01:00
Anton Hansson
9f7cc0d0ab Dedupe mk rules in core_minimal.mk and core_tiny.mk.
These two are the only ones inheriting base.mk, and were largely similar.
This CL moves all the shared stuff up one level into base.mk.

One thing not de-duped yet is the PRODUCT_SYSTEM_SERVER_JARS variable,
as the order of that is significant.

Also sort various lists that were ordered arbitrarily.

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Iddffd6982df039f5daa8be345de338ba11c63c10
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-06-11 15:18:01 +01:00
Anton Hansson
386bd0bbd1 Dedupe mk rules in core_minimal.mk and core_tiny.mk.
These two are the only ones inheriting base.mk, and were largely similar.
This CL moves all the shared stuff up one level into base.mk.

One thing not de-duped yet is the PRODUCT_SYSTEM_SERVER_JARS variable,
as the order of that is significant.

Also sort various lists that were ordered arbitrarily.

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-06-11 15:13:19 +01:00
Xin Li
c8e90b5da3 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I06ede5004b16e1ac0bb5c1c6a225c3c307bd26d1
2018-06-08 11:06:45 -07:00
Anton Hansson
6c65b2c3db Merge "Remove redundant package includes from makefiles." am: e91269dc65 am: f72274c10b
am: eace2ef049

Change-Id: I4afe706e93f31b6bd95b218c7b09853765c1943f
2018-06-08 07:38:24 -07:00
Anton Hansson
eace2ef049 Merge "Remove redundant package includes from makefiles." am: e91269dc65
am: f72274c10b

Change-Id: Iab2dc3cfa97524be471ffa658cfa29efd96e5874
2018-06-08 07:33:03 -07:00
Anton Hansson
b2efa69c98 Remove redundant package includes from makefiles.
These packages are all included in other makefiles in the include
hierarchy:
- atrace, libdl, libtuils are in embedded.mk
- pppd is in base.mk

Bug: 80410283
Test: None
Change-Id: Id00e1af58f2db57090e89348a19c9b1ee7e3311a
2018-06-05 11:36:29 +01:00
Jiyong Park
2317cf5e6e use the phony module name to install org.apache.http.legacy
org.apache.http.legacy.boot which is the runtime library for
org.apache.http.legacy API is now renamed to org.apache.http.legacy.impl
as a result of migration to java_sdk_library.

Installing the runtime library can now be done via the sdk lib name
(org.apache.http.legacy) which internally includes the .impl runtime
lib.

Bug: 77577799
Test: m -j
Test: device boots to the UI. No error related to org.apache.http.legacy
shown in the logcat log.
Test: adb shell cmd package list libraries | grep http shows the
library.

Merged-In: I224bc0f8c58958240130aa7874851ecfdf6f7317
Change-Id: I224bc0f8c58958240130aa7874851ecfdf6f7317
(cherry picked from commit 6ac30d5270)
2018-05-22 20:34:42 +09:00
Jiyong Park
d0ee38b43a use the phony module name to install org.apache.http.legacy
org.apache.http.legacy.boot which is the runtime library for
org.apache.http.legacy API is now renamed to org.apache.http.legacy.impl
as a result of migration to java_sdk_library.

Installing the runtime library can now be done via the sdk lib name
(org.apache.http.legacy) which internally includes the .impl runtime
lib.

Bug: 77577799
Test: m -j
Test: device boots to the UI. No error related to org.apache.http.legacy
shown in the logcat log.
Test: adb shell cmd package list libraries | grep http shows the
library.

Merged-In: I224bc0f8c58958240130aa7874851ecfdf6f7317
Change-Id: I224bc0f8c58958240130aa7874851ecfdf6f7317
(cherry picked from commit 6ac30d5270)
2018-05-22 20:12:54 +09:00
Jiyong Park
6ac30d5270 use the phony module name to install org.apache.http.legacy
org.apache.http.legacy.boot which is the runtime library for
org.apache.http.legacy API is now renamed to org.apache.http.legacy.impl
as a result of migration to java_sdk_library.

Installing the runtime library can now be done via the sdk lib name
(org.apache.http.legacy) which internally includes the .impl runtime
lib.

Bug: 77577799
Test: m -j
Test: device boots to the UI. No error related to org.apache.http.legacy
shown in the logcat log.
Test: adb shell cmd package list libraries | grep http shows the
library.

Change-Id: I224bc0f8c58958240130aa7874851ecfdf6f7317
2018-05-18 13:14:18 +09:00
Dan Willemsen
1084a8015b Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG" am: 63097b276b am: 0eeb4e2f4b
am: 4541382d82

Change-Id: I18dcf149d4afa38c6c34396b6ef50e821b64ef9e
2018-05-09 19:51:08 -07:00
Dan Willemsen
4541382d82 Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG" am: 63097b276b
am: 0eeb4e2f4b

Change-Id: Idaf94b2bdc340ec0bfa013c3b7d418cf766e6555
2018-05-09 19:46:33 -07:00
Dan Willemsen
a362bf4e20 Add micro_bench to PRODUCT_PACKAGES_DEBUG
It's been converted to Soong, so can no longer use LOCAL_MODULE_TAGS. It
appears that some of the test runners expect to have it pre-installed.

Test: m; see it installed.
Change-Id: I189c9bbc2f2add90ac4f6841f4bf13852e4d579f
2018-05-09 17:33:12 -07:00
android-build-prod (mdb)
597f8af4da Merge "Add iotop to PRODUCT_PACKAGES_DEBUG" am: ab235a9fb8 am: 954d6b2075
am: 78c516077c

Change-Id: I8eb6a627c0a0d723ab14a95fdaaf23e5494114c1
2018-05-05 14:49:00 -07:00
android-build-prod (mdb)
78c516077c Merge "Add iotop to PRODUCT_PACKAGES_DEBUG" am: ab235a9fb8
am: 954d6b2075

Change-Id: I5a478d2d9e37bb60e76394ed7be8317da009049c
2018-05-05 14:44:21 -07:00
Dan Willemsen
aeaf4c2407 Add iotop to PRODUCT_PACKAGES_DEBUG
This was previously marked as LOCAL_MODULE_TAGS := debug, and is used
from dumpstate.

Test: iotop is still installed after remove the debug tag
Change-Id: I685456f52403a2d5c6fbbff1429c6af422ce26df
2018-05-04 18:53:34 -07:00
Ricardo Garcia
84d0d52de3 Merge "Dynamics Processing Effect" into pi-dev am: 6a13a5e776
am: a945f34136

Change-Id: I415551e904cd958ef95bd6526a6befcfe5e5f0da
2018-04-19 13:03:27 -07:00
Ricardo Garcia
a945f34136 Merge "Dynamics Processing Effect" into pi-dev
am: 6a13a5e776

Change-Id: I4e3d4367a4b85a49c6a294ae82cae0c32d18dbc0
2018-04-19 12:59:28 -07:00
rago
7657f5ea03 Dynamics Processing Effect
Configuring Dynamics Processing effect

Bug: 64161702
Bug: 38266419

Test: manual and CTS testing
Change-Id: I133d115a4e820bff190f0ecd35efb721ef9a5e82
2018-04-19 09:52:46 -07:00
Andreas Gampe
b873817b9c Merge "Revert "Build: Support for compiled-classes file"" am: 1cd44482db am: 7033cc2c6f
am: 875a95a494

Change-Id: I20e007bcd81427c8ae1d41358d8bb9e7b2119078
2018-04-16 11:30:01 -07:00
Andreas Gampe
875a95a494 Merge "Revert "Build: Support for compiled-classes file"" am: 1cd44482db
am: 7033cc2c6f

Change-Id: I83a5d50c39dc0c83f133121f0680d99388e17daa
2018-04-16 11:17:24 -07:00
Andreas Gampe
35ab4203ef Revert "Build: Support for compiled-classes file"
This reverts commit 96a522037f.

Bug: 76145463
Test: m
Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
2018-04-13 13:08:13 -07:00
TreeHugger Robot
2ef03c3d88 Merge "Add 'honggfuzz' and 'fuzz' to all ASAN / coverage builds" 2018-04-12 01:16:24 +00:00
Zach Riggle
7725c10d61 Add 'honggfuzz' and 'fuzz' to all ASAN / coverage builds
'hongfuzz' is a the interface to all honggfuzz fuzzers.
Unlike libFuzzer, where the entry point *is* the fuzzer binary,
honggfuzz uses a separate binary to drive fuzzing.

'fuzz' is a wrapper script that performs some device-side setup
and sanity checks for fuzzing sessions, while providing a simple
interface to all user-space fuzzers.

Change-Id: Ia55d517e9cb1b7bfcd7d29b137b691e74398ca9e
2018-04-11 22:33:23 +00:00
Zach Riggle
3a26f80cd4 Add sanitizer-status to PRODUCT_PACKAGES_DEBUG
This ensures all -userdebug builds have the sanitizer-status binary,
which is used to check which build flags were used for a given image.

It is important to distinguish between what the build fingerprint
claims, and what is actually available on the phone.

Change-Id: Iac1eabb8c5ed885a057f7a302b1887b7e9c4ccbc
2018-04-03 15:19:44 -05:00
Zach Riggle
9358db72c6 Merge "Add PRODUCT_PACKAGES_DEBUG_ASAN" am: c22e207c50
am: ac6cd7414d

Change-Id: I6ac2c7bf82d305f49a3c8962c0bf8107c1d86373
2018-04-02 21:29:21 +00:00
Zach Riggle
9323b7faf3 Add PRODUCT_PACKAGES_DEBUG_ASAN
This is a list of modules which should be installed by default, but only on
builds which are set up for Address Sanitizer (via SANITIZE_TARGET=address).

Additionally, add sanitizer-status to PRODUCT_PACKAGES_DEBUG so that all
userdebug builds will have the binary.  Currently, the module has the
"debug" tag but it may go away in the future.

Change-Id: I0bea4faf9c2a65380292471437e51ef8324b5af3
2018-03-30 21:09:50 +00:00
Chenbo Feng
53e5a438a8 Merge "Add bpfloader binary to system image" am: 5502f9958a am: 5880e5d7b6
am: 5443668bb0

Change-Id: Ia0112717e4a9dc55ae644f92fe071b9cbb18d2c7
2018-02-13 07:11:57 +00:00
Chenbo Feng
2b948a2259 Add bpfloader binary to system image
The bpfloader is a executable binary used by netd to load and attach
networking related bpf program at run time. It need to be flashed to
device when updating the system image. Currently this binary is only
used by devices with kernel version 4.9 or above.

Test: hikey boot and bpf program show up under sys/fs/bpf
Bug: 30950746
Change-Id: I3d14d270a04ea57319ad4292ff51b1cf933fc975
2018-02-09 15:17:22 -08:00
Paul Duffin
e2819d8456 Conditionally remove atb from bootclasspath
If REMOVE_ATB_FROM_BCP=true then this adds the
framework-atb-backward-compatibility library to the bootclasspath.

Otherwise, it adds the android.test.base library instead.

Bug: 30188076
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I3c15c35724426a9cdeef398c5bc4f5176a8fc752
2018-01-29 11:48:42 +00:00
Paul Duffin
7e4be2c085 Ensure framework-oahl-backward-compatibility is installed
Change made in response to comments on
I17170f873eec93b2e2ed7be3459e2d28c96bbe4c.

Bug: 18027885
Bug: 72375096
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I18020c495bd4f0a4a6f700edd44c2f4e7cf67826
2018-01-26 14:32:06 +00:00
Primiano Tucci
0c9dce22c0 Merge "Add perfetto daemons and cmdline client to core makefiles" am: 27be3bf0e2 am: 80f1fee17b
am: 2165431165

Change-Id: I4ddf70a18936954713459101179c4e20c0b11c2a
2018-01-25 19:04:41 +00:00
Primiano Tucci
90ebe5baf2 Add perfetto daemons and cmdline client to core makefiles
Perfetto is a tracing daemon that allows both to capture
traces from the kernel (via the traced_probes binary)
and allows data to be pushed from userspace (via the
traced binary). Tracing is never enabled by default
and can be kicked off either via statsd or by the shell.
The daemon executables are split only for the sake
of security and isolating SELinux domains. Under the
hoods they are just two shells that run code in the
same shared libarary.
See go/perfetto-sys-health-details for expected
binary / memory / overhead impact.

Bug: 72484603
Test: builds (see go/perfetto-test-spec for test plan)
Change-Id: Ib5fbd7cd2113010398802b622363b75f3eef738d
2018-01-25 15:32:11 +00:00