Commit graph

174 commits

Author SHA1 Message Date
SzuWei Lin
caa5e88d4a 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
Merged-In: I79aefdd1971b3b5724a3ec858de4109b645c765a
2019-01-16 22:23:35 +08:00
Anton Hansson
9b48c52247 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
Merged-In: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
2018-06-26 18:19:46 +01:00
Anton Hansson
a7b36449eb Delete core_tiny.mk
There are no descendants of this mk in AOSP. Move the content that was
shared with core_minimal.mk to base.mk (ContactsProvider and
DefaultContainerService)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-20 15:09:41 +01: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
984e93a450 Merge "Move a few packages from core_minimal.mk to base.mk." 2018-06-15 09:08:33 +00:00
Anton Hansson
be371e1656 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
Merged-In: I133a385b3bc64261d73f616c416f7a905675c09d
2018-06-14 16:39:17 +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
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
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
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
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
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
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
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
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
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
Zach Riggle
953442280d Merge "Add strace back onto userdebug builds" am: e02a37d046 am: 42ba61ca7c
am: 7aaf1eec54

Change-Id: Ice5c9dd7fa2686c8ff8dc431b9d80ed5821418c8
2017-10-18 06:05:43 +00:00
Zach Riggle
7d1f81a048 Add strace back onto userdebug builds
Blueprint stopped supporting the "debug" tag, per dwillemsen

Change-Id: I6c206e058ce32cbea3fd8ae922ac1ba5a0598410
2017-10-17 14:19:53 -05:00
Mathieu Chartier
d83a7f1fdb Update paths for frameworks/base/config
Bug: 64259751
Test: make

(cherry picked from commit 37ba2d97df)

Change-Id: Iac1f92d1e4126d088b691c46a0b858e9e9bfb1a4
Merged-In: Ie159ef9f3f96d7ecd22429327a64161bd63f525b
2017-09-28 17:54:20 +00:00
Mathieu Chartier
92c48b9da3 Merge "Update paths for frameworks/base/config" into oc-mr1-dev
am: 3a1776a777

Change-Id: I98219d3e398c26be485887fa914060ed8f682ea2
2017-08-14 16:58:38 +00:00
Mathieu Chartier
37ba2d97df Update paths for frameworks/base/config
Bug: 64259751
Test: make
Change-Id: Ie159ef9f3f96d7ecd22429327a64161bd63f525b
2017-08-11 14:45:05 -07:00
Jeff Hao
4ae165c7ae Add dirty-images-objects handling to boot image build.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

Bug: 62554875
Test: mm test-art-host

(cherry picked from commit 865d54caf2)

Change-Id: Id711ad1c2d98b12b0f55a29acca8a96834d69ede
2017-08-10 15:21:44 -07:00
Mark Salyzyn
6157cf697a Merge "logcat: permit transition to Android.bp" am: 374f753211 am: 1830c9596d am: 5d9e6eb512
am: 2888bd2385

Change-Id: I559ff3733eacced71fedf5b4088dab32433dbc21
2017-08-09 00:09:03 +00:00
Mark Salyzyn
1830c9596d Merge "logcat: permit transition to Android.bp"
am: 374f753211

Change-Id: Ieeee905248faea638ed18831ba2168f2914f7d02
2017-08-08 23:10:03 +00:00
Treehugger Robot
374f753211 Merge "logcat: permit transition to Android.bp" 2017-08-08 23:06:25 +00:00
Mark Salyzyn
719790f4d4 logcat: permit transition to Android.bp
Permit transition of logcat to Android.bp by moving the debug
target logpersist.start to the PRODUCT_PACKAGES_DEBUG list.

Test: compile
Change-Id: I6cfd4c40f848a2ff2661e3692fa8cd69ed99e8c9
2017-08-08 14:24:55 -07:00
Jeff Hao
d405e38d62 Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8 am: 3b16c4e7c7 am: 5b3e24484c
am: 7e6899ac53

Change-Id: I1db95c6b937d4ef0c930739407e799383781b068
2017-08-05 01:30:20 +00:00
Jeff Hao
3b16c4e7c7 Merge "Add dirty-images-objects handling to boot image build."
am: 5848fedea8

Change-Id: Ida5683c28ed78db625a5383f52b81a087373ea75
2017-08-05 01:02:18 +00:00
Jeff Hao
b454ee195a Add dirty-images-objects handling to boot image build.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

(cherry-picked from commit 865d54caf2)

Bug: 62554875
Test: mm test-art-host

Merged-In: I2486d2704d74a192f1ecdc02589e569b61efa4ae
Change-Id: I2486d2704d74a192f1ecdc02589e569b61efa4ae
2017-08-03 11:04:11 -07:00
TreeHugger Robot
ec67d4fa1c Merge "cas: add CAS hal to build" 2017-06-28 20:37:25 +00:00
Tomasz Wasilczyk
4261cdc47c Remove previous implementation of RadioService.
Bug: b/36863239
Test: instrumentalization
Change-Id: Ic47b3aad2e7b9662059451bebf87ec55807a6c7c
2017-06-23 10:46:14 -07:00
Chong Zhang
3abc30baa5 cas: add CAS hal to build
bug: 22804304
Change-Id: I05604644854a561bc9356bb66bcd7d315e3f2d5a
2017-06-21 13:37:42 -07:00
Paul Duffin
f170ad5f55 Merge "Added android.test.mock to PRODUCT_PACKAGES" am: 87b69b97f3
am: b349e09a18

Change-Id: I242537e012490770a7a3bbdd235dc6016984804b
2017-06-14 11:14:43 +00:00
Paul Duffin
c45b7e3d98 Added android.test.mock to PRODUCT_PACKAGES
Adds android.test.mock.jar to the /system/framework
directory. That will allow it to be dynamically included
with a uses-library manifest entry.

Bug: 30188076
Test: flash and check contents of /system/framework
Change-Id: I3ea0e558276176edd21e24c8337980c5c02a652e
2017-06-09 13:34:13 +01:00
Pawin Vongmasa
c744088b0f Merge "Add media_profiles_V1_0.dtd" into oc-dev
am: 8d66d58d1d

Change-Id: I160e09ee10f87c3ba4d0e83a5d75682082d700fb
2017-05-18 06:15:49 +00:00
Pawin Vongmasa
afa2915563 Add media_profiles_V1_0.dtd
Test: media_profiles_V1_0.dtd exists in system/etc

Bug: 36430270
Merged-In: I847a774baf2172d83d414f1794794089b383ded3
Change-Id: I847a774baf2172d83d414f1794794089b383ded3
2017-05-16 19:08:12 -07:00
Colin Cross
d1c7f53aa4 Merge "Install sqlite3 on userdebug builds" am: 5821266790 am: 1ddf97bafb
am: f7365b6137

Change-Id: I1292f19401ba3a65fedff3a75eea72bcc8ad53bc
2017-05-02 02:49:09 +00:00
Colin Cross
9418749c48 Install sqlite3 on userdebug builds
sqlite3 had LOCAL_MODULE_TAGS := debug, which was not passed
through when converting to soong.  We prefer PRODUCT_PACKAGES_DEBUG
instead, so add it there.

Bug: 37627999
Test: sqlite3 is in installed-files.txt
Change-Id: Idb8b3aea7b7482109aa4ed3ac0016bd84dd23f22
2017-05-01 21:39:40 +00:00
Michael Wright
32c89d462f Merge "Remove inputflinger from the builds." 2017-03-22 15:16:53 +00:00
TreeHugger Robot
76c194e2a3 Merge "Change mediacodec to android.hardware.media.omx@1.0-service" 2017-03-22 06:15:40 +00:00
Pawin Vongmasa
022cf53b82 Change mediacodec to android.hardware.media.omx@1.0-service
Test: Manual use of Camera and YouTube apps.
Bug: 35328855
Change-Id: I505fc96384fdeb3fa4ad2ba69d93cc64cd8e6b9e
2017-03-17 17:46:36 -07:00
Michael Wright
7d4944da37 Remove inputflinger from the builds.
Some day... some day...

Test: builds
Change-Id: I1a0390c7bfa15f7590a869ba5e12e112ec510602
2017-03-16 14:38:36 -07:00
Chong Zhang
ad3bb1b0f2 Add clear key CAS plugin (libclearkeycasplugin.so) to build.
bug: 22804304
Change-Id: Ie1bbe563740d7002f0fc082b4e10ca04d80c1277
2017-03-16 12:38:01 -07:00
Ray Essick
32e3c4bc40 change mediaanalytics to mediametrics
mediaanalytics has been renamed to mediametrics; set up
so that we build the new component name instead of the old one.

Bug: 34615027
Test: clean build, proper binary generated
2017-01-23 12:04:17 -08:00
Christopher Tate
ad71d65dc0 Add framework sysconfig content to the build
Bug 30953212

Change-Id: I2f9f301a38c9d2e7214222f00a44f8ef23f36e6f
2017-01-19 15:22:53 -08:00
Chris Tate
2b22ec459d Revert "Add framework sysconfig content to the build"
This reverts commit d68045446f.

Change-Id: I86b3c0fbe3eaec915f7dcf92623382d77d008734
2017-01-19 01:12:11 +00:00
Christopher Tate
d68045446f Add framework sysconfig content to the build
Bug 30953212

Change-Id: Ib5e45b9f579bc7c5dcef2384422bc18b4d22fd82
2017-01-13 14:06:43 -08:00
Joe Onorato
3d6f568ef3 Merge "Add incident (protobuf bugerport / known bad) files to base.mk product." 2016-12-16 18:19:49 +00:00
Jorim Jaggi
3456f2d7ce Add missing locksettings package
Change-Id: Icf50402a5adc8b007ee3c27dcf0e4ccc65c35425
Fixes: 33430858
Fixes: 33645392
2016-12-15 16:58:32 -08:00