Commit Graph

46000 Commits

Author SHA1 Message Date
Anton Hansson
0c6795938a [automerger skipped] Merge "Move packages from base_system to base_vendor."
am: b02bda26bd  -s ours

Change-Id: I895669af593e860e6d0a331433d442a7ad6242ae
2018-07-09 23:37:24 -07:00
Anton Hansson
378f4bcb52 [automerger skipped] Merge "Remove redundant packages from core_minimal.mk"
am: 56a3498703  -s ours

Change-Id: Id322db2482753e3234c141a5b890947286789bc6
2018-07-09 23:36:51 -07:00
Anton Hansson
4788f5b094 Merge "Warn when defining a 32-bit product on a 64-bit device." 2018-07-10 06:29:44 +00:00
Anton Hansson
a37da42c12 Merge "Align base_system and core_minimal with internal." 2018-07-10 06:29:13 +00:00
Anton Hansson
65dc646c76 Merge "Make including missing modules an error." 2018-07-10 06:28:41 +00:00
Anton Hansson
b02bda26bd Merge "Move packages from base_system to base_vendor." 2018-07-10 06:27:30 +00:00
Anton Hansson
56a3498703 Merge "Remove redundant packages from core_minimal.mk" 2018-07-10 06:27:08 +00:00
Anton Hansson
60389468a7 Merge "Move packages from base_system to base_vendor." into stage-aosp-master 2018-07-10 05:59:38 +00:00
Anton Hansson
0546208495 Merge "Remove redundant packages from core_minimal.mk" into stage-aosp-master 2018-07-10 05:59:19 +00:00
Luis Hector Chavez
930ceb30b9 Merge "Depend on the ramdisk/root files for BOARD_BUILD_SYSTEM_ROOT_IMAGE"
am: b676d6d609

Change-Id: I0e13f4327ce066a56f856985c07f1e8f4c373d24
2018-07-09 16:13:08 -07:00
Treehugger Robot
b676d6d609 Merge "Depend on the ramdisk/root files for BOARD_BUILD_SYSTEM_ROOT_IMAGE" 2018-07-09 23:04:32 +00:00
Mathieu Chartier
cab7408131 Merge "Add logic to preopt both archs for SDK libs"
am: f3c54cfa78

Change-Id: I1f0336118e71c7da5fa5526425121811c0faace6
2018-07-09 12:58:13 -07:00
Treehugger Robot
f3c54cfa78 Merge "Add logic to preopt both archs for SDK libs" 2018-07-09 19:49:51 +00:00
Luis Hector Chavez
ff48993ca6 Depend on the ramdisk/root files for BOARD_BUILD_SYSTEM_ROOT_IMAGE
When using BOARD_BUILD_SYSTEM_ROOT_IMAGE, there is no direct dependency
on the files that get typically added to the ramdisk.img apart from the
NOTICE.html dependency that some files have. This change explicitly adds
the ramdisk/root files as a dependencies of system.img so that the image
is recreated any time a file in the ramdisk changes. It also creates the
installed-files-root.txt file.

Bug: 62387674
Test: /init.rc is present in system.img's dependencies
Change-Id: I234cb8d8a648f8963610be519de1b70b7efe1fd7
2018-07-09 11:07:12 -07: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
David Brazdil
efc311b3ac Merge "Make classes.jar the output of uninstallable Soong Java modules"
am: cf91546456

Change-Id: Ic090bb36a6b6f12db2f5416a1c504dc6341eca4c
2018-07-09 09:34:24 -07:00
David Brazdil
cf91546456 Merge "Make classes.jar the output of uninstallable Soong Java modules" 2018-07-09 16:24:16 +00: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
e8d663cb58 Remove redundant packages from core_minimal.mk
These are all in base_system.mk

Bug: 80410283
Test: make
Change-Id: I8717f2d9de10cde44458029692b308017ee2164b
2018-07-09 14:05:47 +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
133fcb2550 Warn when defining a 32-bit product on a 64-bit device.
Building a 32-bit-app-only product on a 64-bit capable device is likely
to be unintentional. Print a warning if this is done implicitly,
e.g. via forgetting to define the TARGET_SUPPORTS_64_BIT_APPS variable.

Also change existing references to only treat 'true' as a positive
value, rather than all non-empty ones.

Bug: 110918674
Test: lunched 64-bit-device product that does and doesn't set this var
Change-Id: I021157c94ec3ac1c690547c8992768e58c89c287
2018-07-09 13:17:52 +01:00
Anton Hansson
1ebcbd51ee Make including missing modules an error.
Only enable it for the core build files rolling up to generic.mk
for now, and whitelist a couple of modules that are conditionally
defined.

Bug: 7456955
Bug: 80410283
Test: lunch generic; m
Test: lunch full; m
Change-Id: I5448769433d09eaf970c4231874ced3261a5c66b
2018-07-09 11:00:24 +01:00
SzuWei Lin
808b06d658 Merge "Add USE_XML_AUDIO_POLICY_CONF to GSI"
am: 88a60636b3

Change-Id: I4472c2d88202bd8a074373a8b1325e4d96efa6a8
2018-07-07 16:34:10 -07:00
Isaac Chen
8b70aabeae [automerger skipped] Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch"
am: b000623314  -s ours

Change-Id: I1f666072f6d378932c24f625e162314480e81f07
2018-07-07 16:30:41 -07:00
Treehugger Robot
88a60636b3 Merge "Add USE_XML_AUDIO_POLICY_CONF to GSI" 2018-07-07 23:27:40 +00:00
Treehugger Robot
b000623314 Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" 2018-07-07 23:24:48 +00:00
Steven Moreland
e2c90abd90 Merge "aidl: -ninja -> --ninja"
am: 9721ee965e

Change-Id: I9ac08d786f2055810f2fd8fef33139c9b49154b7
2018-07-06 17:24:51 -07:00
Treehugger Robot
9721ee965e Merge "aidl: -ninja -> --ninja" 2018-07-07 00:19:45 +00:00
Tao Bao
27bc4a9b1d Merge "releasetools: Remove three obsolete functions from EdifyGenerator."
am: e9856a835f

Change-Id: Iaf358557ae4ac4e154894868701c84f350ae7a6e
2018-07-06 16:30:56 -07:00
Tao Bao
e9856a835f Merge "releasetools: Remove three obsolete functions from EdifyGenerator." 2018-07-06 23:22:59 +00:00
Mathieu Chartier
f604a3d1cf Merge "Allow multiple profiles to be added as part of boot.prof"
am: a3010c60fe

Change-Id: I7a0c4770e1cd8fa94971bc3982f2b14cf1a1c553
2018-07-06 16:14:53 -07:00
Mathieu Chartier
a3010c60fe Merge "Allow multiple profiles to be added as part of boot.prof" 2018-07-06 23:03:23 +00:00
Tao Bao
a24f711bf3 releasetools: Remove three obsolete functions from EdifyGenerator.
Namely MakeTemporary, Verify and FileCheck. They were once used for
file-based OTA that has been deprecated.

Test: Check that there's no active user, including device-specific
      releasetools script.
Change-Id: Ic73054d73271ad91e860b34b2ba156361c58bc1a
2018-07-06 14:21:26 -07:00
Tao Bao
a85cb404cd Merge "releasetools: Add dict-like setter to BuildInfo."
am: ee36b42beb

Change-Id: I97039b14a1664d5cddd2cf44de600686bbf3f26d
2018-07-06 14:05:23 -07:00
Tao Bao
ee36b42beb Merge "releasetools: Add dict-like setter to BuildInfo." 2018-07-06 20:56:53 +00:00
Steven Moreland
385442d399 aidl: -ninja -> --ninja
Bug: 110967839
Test: AIDL's runtests.sh
Change-Id: I785d39846a477c7edb91db477a0dfa046d823cbf
2018-07-06 11:35:09 -07:00
Tao Bao
667c7534ed releasetools: Add dict-like setter to BuildInfo.
BuildInfo already has dict-like getters. This CL adds the matching
setter method to keep it backward compatible with device-specific
scripts that expect a dict.

It also adds items() method that allows iterating the items.

Bug: 111087332
Test: python -m unittest test_ota_from_target_files.BuildInfoTest
Test: Generate an incremental OTA that sets info_dict in device-specific
      releasetools script.
Change-Id: Idd033f98a9186740f9da1a300d4c2bdddd9c1345
2018-07-06 10:15:13 -07:00
Isaac Chen
9af10a31bf Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch
GSI Pi (for newly launched devices) need to enable this to pass
VtsTrebleSysProp.

Bug: 79395858
Test: Built aosp_{arm,arm64,x86,x86_64}. Check system/etc/prop.default
    and found "ro.actionable_compatible_property.enabled=true".
    aosp_x86(_64) could boot to home screen.

Change-Id: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
Merged-In: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
2018-07-06 13:41:08 +08:00
SzuWei Lin
fa420b40c5 Add USE_XML_AUDIO_POLICY_CONF to GSI
USE_XML_AUDIO_POLICY_CONF is must for Treble device, so it is
also must on GSI. The settings is missed when creating GSI
aosp_$arch, add it back by this patch.

Bug: 110988359
Bug: 111053290
Test: build aosp_arm64 and build pass
Change-Id: I95f096e58350233fdcc8de115cc1691360070445
2018-07-06 13:22:35 +08:00
Isaac Chen
ec61443226 [automerger skipped] Merge "Refactor BoardConfig.mk for emulator products"
am: 87399730de  -s ours

Change-Id: I96c43c1140a80e687a47f51692d943ba1abc5469
2018-07-05 19:18:13 -07:00
Isaac Chen
87399730de Merge "Refactor BoardConfig.mk for emulator products" 2018-07-06 02:08:35 +00:00
Anton Hansson
e5a5f00b9e Merge "Add documentation for module resolution."
am: ce0d4aa328

Change-Id: I85aa55b9985e91001e56088579a376f46d9d03e5
2018-07-05 09:43:36 -07:00
Anton Hansson
ce0d4aa328 Merge "Add documentation for module resolution." 2018-07-05 16:38:31 +00:00
Anton Hansson
0ba5380361 [automerger skipped] Merge "Remove non-existing packages from common mks."
am: c8cd56fcff  -s ours

Change-Id: I6e671cf3f4f4a612da7e9a655f0fb8c52cb0ab14
2018-07-05 09:32:36 -07:00
Anton Hansson
c8cd56fcff Merge "Remove non-existing packages from common mks." 2018-07-05 16:21:28 +00:00
Anton Hansson
2dee452c92 Merge "Remove non-existing packages from common mks." into stage-aosp-master 2018-07-05 15:52:17 +00:00
Anton Hansson
eb3358cfa7 Add documentation for module resolution.
I found this in the CL description of
I5fda1a77f58814097b10b5ad2743ee25adfaecc4, and modified it slightly.

Bug: 111154853
Test: No
Change-Id: I984ac1a9521357af6b54340939dcde36988fc634
2018-07-05 16:31:33 +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
06a23f8414 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
2018-07-05 13:38:26 +01:00
Dario Freni
37333682da Merge "Install /system/product apps odex in system-other."
am: 12e0e51116

Change-Id: I557c83122eb3d0bc894e479d645d353630075bb8
2018-07-05 05:30:18 -07:00