177 Commits

Author SHA1 Message Date
Justin Yun
7aecc39136 Create *_system_ext.mk for system_ext packages
The default packages for system_ext partition must be added to
*_system_ext.mk.
We have empty list for now, but will update the files soon.

Bug: 134359158
Bug: 139053989
Test: build and boot
Change-Id: I78c85c3a9ff0437906143c2d4982ecfb0e4d058d
2019-11-05 05:45:15 +00:00
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
34bca8808e Split core_minimal in two.
Add media_system and media_vendor makefiles which
together make up core_minimal. Document what belongs
in these files.

Also update mainline_system to inherit media_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
Merged-In: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
2018-07-10 16:49:05 +01:00
Anton Hansson
a37da42c12 Merge "Align base_system and core_minimal with internal." 2018-07-10 06:29:13 +00:00
Anton Hansson
56a3498703 Merge "Remove redundant packages from core_minimal.mk" 2018-07-10 06:27:08 +00:00
Mathieu Chartier
502892a936 Add logic to preopt both archs for SDK libs
Update stale PRODUCT_SYSTEM_SERVER_JARS list since
com.android.location.provider was renamed to
com.android.location.provider.impl.

Added logic to preopt both archs for SDK libs that are also system
server JARS.

Bug: 110780021
Test: manual and verify speed compiled

(cherry picked from commit 4568c2d908)

Merged-In: I34e728444ffda6db3375b638028d54b6ab623209
Change-Id: If0cb68ba4808aa8716099c5447645f4baac63f30
2018-07-09 11:05:21 -07:00
Anton Hansson
b07453509e Align base_system and core_minimal with internal.
Move a few things up from core_minimal.mk to base_system, and make
a few other editing tweaks in base_system, to align it more closely
with the internal version.

Test: make
Change-Id: I3d0fd22ea1cf94b0d28610cc15e23aca3ddd21c4
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-07-09 15:32:16 +01:00
Anton Hansson
274a209c45 Remove redundant packages from core_minimal.mk
These are all in base_system.mk

Bug: 80410283
Test: make
Change-Id: I8717f2d9de10cde44458029692b308017ee2164b
Merged-In: I8717f2d9de10cde44458029692b308017ee2164b
2018-07-09 14:02:25 +01:00
Anton Hansson
159acd4e0a Remove non-existing packages from common mks.
These were found by comparing PRODUCT_PACKAGES to $(ALL_MODULES). It
will be made an error for the core makefiles to depend on non-existing
modules soon.

Bug: 7456955
Bug: 80410283
Test: make
Test: diff various products before and after
Change-Id: I5d8af175a48172e63926e68f39daad4508f37ccb
Merged-In: I5d8af175a48172e63926e68f39daad4508f37ccb
2018-07-05 13:39:27 +01:00
Anton Hansson
c0dd046586 Move 6 packages up from core_base.mk
Also remove two nonexistant packages (libnfc_ndef & libvariablespeed).

The moved packages are already being pulled in by being required by
other included packages in one of its parents (base or core_minimal).

These are the moved packages and their pre-existing deps:
- libmdnssd: by netd in base.mk
- libandroidfw: by 7 packages, many in base.mk
- libaudioutils: by 3 packages, e.g libmedia in base.mk
- libpowermanager: by 3 packages, e.g. libaudioflinger in base.mk
- libspeexresampler: by libaudioutils
- libwebrtc_audio_preprocessing: by libaudiopreprocessing in core_minimal.mk

This change makes core_base.mk very small. It will be deleted in a
followup-CL and its contents inlined in its direct children.

Bug: 80410283
Bug: 7456955
Test: make
Change-Id: I1240ec6adc5b9208effd6fc70892dfbd453a1fba
2018-06-26 21:57:13 +01: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
8bc96c162c Merge "Delete core_tiny.mk" 2018-06-20 17:15:53 +00: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
19fc0e3c2b Remove core.mk.
It only has one mk inheriting it now, so it's redundant. Push its
packages into the single child (generic_no_telephony.mk).

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
Merged-In: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
(cherry picked from commit 57000e3c79)
2018-06-20 14:42:30 +01: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
Anton Hansson
5c1dc143cd Dedupe packages in mk's that inherit core_minimal.mk
The following packages are moved up one level, into core_minimal.mk
as all its descendants in master share them:
    ContactsProvider
    DefaultContainerService
    libaudiopreprocessing
    libfilterpack_imageproc
    libgabi++
    libstagefright_soft_aacdec
    libstagefright_soft_aacenc
    libstagefright_soft_amrdec
    libstagefright_soft_amrnbenc
    libstagefright_soft_amrwbenc
    libstagefright_soft_avcdec
    libstagefright_soft_avcenc
    libstagefright_soft_flacdec
    libstagefright_soft_flacenc
    libstagefright_soft_g711dec
    libstagefright_soft_gsmdec
    libstagefright_soft_hevcdec
    libstagefright_soft_mp3dec
    libstagefright_soft_mpeg2dec
    libstagefright_soft_mpeg4dec
    libstagefright_soft_mpeg4enc
    libstagefright_soft_opusdec
    libstagefright_soft_rawdec
    libstagefright_soft_vorbisdec
    libstagefright_soft_vpxdec
    libstagefright_soft_vpxenc
    mdnsd
    requestsync

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
Merged-In: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
2018-06-12 15:25:06 +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
Sundong Ahn
b87bdedba5 Remove com.android.mediadrm.signer.xml
The com.android.mediadrm.signer.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Merged-In: Icd19b896c92b347e0452c5bfb21a331e727a4f08
Change-Id: Icd19b896c92b347e0452c5bfb21a331e727a4f08
(cherry picked from commit b2d6b3bcf2)
2018-06-01 15:27:44 +09:00
Jiyong Park
565ec59f1f org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
The name of the runtime library name for the SDK library
org.apache.http.legacy has changed to org.apache.http.legacy.impl as it
is now built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.

Bug: 77577799
Test: m -j
Merged-In: Ie049d06d78cc403454c2885def88a167975b4204
Change-Id: Ie049d06d78cc403454c2885def88a167975b4204
(cherry picked from commit 7f9a1a49cf)
2018-05-22 20:37:30 +09:00
Justin Yun
992ef6c6e0 Separate vndk_snapshot_package from vndk_package
vndk_package only includes current VNDK builds without snapshots.
The snapshots will be included by PRODUCT_EXTRA_VNDK_VERSIONS
regardless of vndk_package in PRODUCT_PACKAGES.

Bug: 71609233
Test: Generate snapshot files and include the version in
      PRODUCT_EXTRA_VNDK_VERSIONS. Check if snapshots are installed.

Change-Id: If788af2f7773dd50b8b9ceb1957b8e54fde9ca9f
2018-01-19 09:51:24 +09:00
Yao Chen
2e006b7dc8 Merge "Set the default ring buffer size for stats log, and set it loggable."
am: adbaeb0c1d

Change-Id: I86a62bad86030eb3cc3ce3d6806c56cf87a711b4
2017-11-21 19:49:36 +00:00
Treehugger Robot
adbaeb0c1d Merge "Set the default ring buffer size for stats log, and set it loggable." 2017-11-21 19:44:56 +00:00
Yao Chen
8ce8dc2efa Set the default ring buffer size for stats log, and set it loggable.
Bug: 69323063
Test: manual
Change-Id: I19de884927bc4999d503b919d851048609be1470
2017-11-21 09:02:12 -08:00
Xin Li
44dd4881de Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: I7594bb72dd7e847292eb502edd918e41318aac29
Merged-In: Ide82473d358719f7e01cd2a4a85db954f3722f14
2017-11-14 11:36:22 -08:00
Jaekyun Seok
4022ec99a6 Move system default values in system partition
The following properties are specified under platform/build as system
default values.

- tombstoned.max_tombstone_count
- debug.atrace.tags.enableflags
- dalvik.vm.dex2oat-minidebuginfo

So they should move into system partition.

Bug: 64661857
Test: confirmed that the default properties were stored in
/system/etc/prop.default on sailfish device
Change-Id: Ic34c05fd9761e281962b6bb425e4babedfca45a9
2017-11-14 05:43:35 +00:00
Jin Qian
bd532fbf2e Merge "Replace make_ext4fs with mke2fs" 2017-11-03 17:28:57 +00:00
Jin Qian
95b2b695cd Replace make_ext4fs with mke2fs
make_ext4fs is deprecated and should be replaced with mke2fs

Bug: 64395169
Change-Id: Idfc8c0ee0ff598fdaa6f20bb0d4f6dca687a1b10
2017-11-02 16:27:41 -07:00
Bowgo Tsai
66b8b53018 Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk" am: 96929d691e am: 2b83ca7481
am: 47b71b396b

Change-Id: I9443752fb9cc751d655782cedf3c7c688500e1ee
2017-10-19 02:22:26 +00:00
Bowgo Tsai
2b83ca7481 Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk"
am: 96929d691e

Change-Id: I0a208412fe98cbd06b24bfba24f5f08edb95bb52
2017-10-19 01:56:00 +00:00
Bowgo Tsai
7912a9e760 Removing keystore.default from core_tiny.mk and core_minimal.mk
keystore.default is not the current default implementation
and is not needed on running devices.

Bug: 65613798
Test: boot device

Change-Id: Ide82473d358719f7e01cd2a4a85db954f3722f14
2017-10-17 18:22:51 +08:00
Mathieu Chartier
e3196ada4c Merge "Update paths for frameworks/base/config"
am: e984c78faf

Change-Id: I44a5cb37d1d05a3b7619e04e661f9cca8d9b3fde
2017-09-29 00:20:46 +00: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
Nicolas Geoffray
da7c0efec1 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469 am: 30f7a02a7a am: 1fe6892e19
am: db18b88c15

Change-Id: Icba118331fd26b92edaa373d2fd7a99e5eed0b09
2017-08-15 07:54:56 +00:00
Nicolas Geoffray
db18b88c15 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469 am: 30f7a02a7a
am: 1fe6892e19

Change-Id: I6666568d1078d0d7dd9fb298dd9bf9c2911062d5
2017-08-15 07:50:55 +00:00
Nicolas Geoffray
30f7a02a7a Merge "Add com.android.location.provider to the system server classpath."
am: 24678e9469

Change-Id: I0ca70630d4a607feead6ab9c1feddc878e40f698
2017-08-15 07:40:39 +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
Nicolas Geoffray
ec5e04096b Add com.android.location.provider to the system server classpath.
bug: 64571709
Test: com.android.location.provider is speed compiled in /system
Change-Id: I64c5d5257cffb9bc8481bd4fb78a65cb08ac993a
2017-08-10 20:30:48 +01:00
Jeff Hao
7e6899ac53 Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8 am: 3b16c4e7c7
am: 5b3e24484c

Change-Id: I18365f7c17ccb0b2e90dd4ecfbddaeb5843bcfde
2017-08-05 01:20:34 +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
Jean-Luc Brouillet
4f612c6f36 Adds the Neural Networks lib to the base configuration.
This will ensure that the library is on all devices even
if no builtin apps uses the lib.

Bug: 63905942
Test: Ran an application that uses the NN API.
Change-Id: I52ce6142f94d21ca55fa26875fab3f4926e2c6bb
2017-07-21 20:13:14 -07:00
Andreas Gampe
205958cb38 Merge "Build: More tombstones in userdebug"
am: 5378d0a7eb

Change-Id: I414a28b22f8677099ab61812995ca6715f8f2563
2017-07-07 15:23:48 +00:00
Andreas Gampe
0b24deb839 Build: More tombstones in userdebug
am: 47e137f357

Change-Id: I6dc83edb29170e1f5a3c70d823d5c3a8d0089a7e
2017-07-07 06:57:16 +00:00
Andreas Gampe
427e49e0da Build: More tombstones in userdebug
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.

(cherry picked from commit 47e137f357)

Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
2017-07-06 23:54:14 -07:00
Andreas Gampe
47e137f357 Build: More tombstones in userdebug
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.

Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
2017-07-06 21:20:54 -07:00
SzuWei Lin
9df6f1c5ca Merge "Add wificond to Android makefiles" into oc-dr1-dev
am: b1cbbaf528

Change-Id: I584ad2a70099f1fb189766df79a1c19ac6927b73
2017-06-25 13:55:06 +00:00
SzuWei Lin
af505d5f2f Add wificond to Android makefiles
wificond is part of the framework, and shouldn't be modified by
vendor. The patch adds wificond to PRODUCT_PACKAGES list of
Android makefile, and removes it from treble_common.mk.

Bug: 62646878
Test: Build and check the file existance in system image
Change-Id: I92f2b64c1912ed5106a72a56e831bc989a70979e
2017-06-19 16:06:11 +08:00
Igor Murashkin
cda3d10e56 core: Move core.oat bootjar definitions into envsetup.mk
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal bootclasspath jars necessary to run
with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk to reuse TARGET_CORE_JARS.
The above variables can be used from scripts with get_build_var from envsetup.sh

  $> get_build_var TARGET_CORE_JARS
  <prints list of core jars>

(These changes are required to figure out what --bootclasspath_entry to pass to desugar).

Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
(cherry picked from commit f33a96c07f)
2017-06-16 03:08:33 +00:00
Igor Murashkin
9d4639c8c2 core: Move core.oat bootjar definitions into envsetup.mk
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk
to reuse TARGET_CORE_JARS.

The above variables can be used from scripts with get_build_var
from envsetup.sh

  $> get_build_var TARGET_CORE_JARS
  <prints list of core jars>

(These changes are required to figure out what --bootclasspath_entry
to pass to desugar).

Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Merged-In: If12569719343bfbba20c1cda9a5302ab541dbfc6
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
2017-06-16 00:54:47 +00:00