Commit graph

69 commits

Author SHA1 Message Date
Anton Hansson
ee25fc7a63 Merge "Add recovery_refresh to mainline_system" am: 8fbdd25457 am: 628e7ff762
am: b5ca00950b

Change-Id: I3555941bb1840ed400ccfb786695239da14f5d87
2019-01-28 03:07:00 -08:00
Anton Hansson
91fddbbd95 Add recovery_refresh to mainline_system
Needed by recovery on devices without a cache partition.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I71fd35022b0928016f6767cea35971ce14bf03fe
2019-01-25 11:27:27 +00:00
TreeHugger Robot
267a15129b Merge "Load sw C2 codecs from apex" 2019-01-16 03:05:37 +00:00
Chong Zhang
dfdf978f58 Load sw C2 codecs from apex
Replace the C2 entrypoint lib with apex.

bug: 111407413
Change-Id: I7b118f69219f143d55560ec824dd93066da8c842
2019-01-10 02:08:07 +00:00
Anton Hansson
0fed3cf513 Merge "Add adb_keys to mainline_system if they exist" am: 3a4a966507 am: 83d2837f4b
am: 01193c8f4c

Change-Id: Ib392eca3ff1627b96ed6a7ce138abad07d418e8c
2019-01-08 04:14:05 -08:00
Anton Hansson
3a4a966507 Merge "Add adb_keys to mainline_system if they exist" 2019-01-08 11:40:25 +00:00
Ahmed ElArabawy
69e62af873 Wifi: Add Wifi library to mainline_system
This commit adds android.hardware.wifi@1.0.so to mainline_system.

Bug: 122363107
Test: Successful build
Test: lunch crosshatch-userdebug ; make -j64
Test: lunch mainline_system_arm64; make -j64
Change-Id: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
Merged-In: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
(cherry picked from commit b38ce5a6ff)
2019-01-08 09:24:48 +00:00
Ahmed ElArabawy
b38ce5a6ff Wifi: Add Wifi library to mainline_system
This commit adds android.hardware.wifi@1.0.so to mainline_system.

Bug: 122363107
Test: Successful build
Test: lunch crosshatch-userdebug ; make -j64
Test: lunch mainline_system_arm64; make -j64
Change-Id: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
2019-01-07 08:57:06 -08:00
Anton Hansson
0cb36d7bbc Add adb_keys to mainline_system if they exist
Similar to I1720644d89ec5289fbe99f95ebcdfbb3f3b20e67,
but for mainline_system. This reduces the diff between
full_base.mk and mainline_system, a step on the way to
get aosp_blueline inheriting mainline_system.

Bug: 118826166
Test: make
Change-Id: I52bfe5dfb3e1a22db2d46fe9d1f372ee25533fdd
2019-01-07 14:36:12 +00:00
Anton Hansson
7bd6935ba3 Merge "Add a languages_default.mk" am: 14fc7361b9 am: a8345dff8a
am: 987412cb00

Change-Id: I25cc2a0b07061cfdf78a4dd7cadc80012c6f5a57
2019-01-07 03:00:46 -08:00
Anton Hansson
0fc8fd99a8 Merge "Remove km_MH locale from mainline" am: 47ca8d0a73 am: 49cd6c9c0e
am: 885f6c1081

Change-Id: I5049fb12135e8e37a19732b2779e40639e6edf69
2019-01-07 02:59:48 -08:00
Anton Hansson
14fc7361b9 Merge "Add a languages_default.mk" 2019-01-07 10:32:25 +00:00
Anton Hansson
47ca8d0a73 Merge "Remove km_MH locale from mainline" 2019-01-07 10:31:52 +00:00
Anton Hansson
2110e47a90 Merge "Add Tag to mainline_system" am: ad68902d5a am: aa02046b93
am: 6ae671edd1

Change-Id: I19e26b41f1d6360d358b0f1dae23b3c88656aaac
2019-01-04 08:57:51 -08:00
Anton Hansson
c004218b8b Add a languages_default.mk
This is the same list of languages that was in mainline_system.mk
before, but sorted alphabetically.

Make languages_full inherit this list and add the only locale present
that was previously unique (the en_XC pseudo-locale).

Test: make
Change-Id: I09f0c7521740d4c779d5fd2a50baa92b7cdfe8d4
2019-01-04 14:19:59 +00:00
Anton Hansson
beb15ac6a8 Remove km_MH locale from mainline
This doesn't appear to be a real locale. The interpretation would be
khmer spoken in the Marshall Islands, which doesn't appear to be a thing.
The locale doesn't appear in https://lh.2xlibre.net/locales/ or
frameworks/base/core/res/res/values/locale_config.xml.

It might have been a typo when it was introduced in internal change
I78d91916fdbb04502466c26bf7d160fe679aaa31.

Test: make
Change-Id: Id1deebdd8ad2a5601c15b84e010be766b3a951e9
2019-01-04 14:15:04 +00:00
Anton Hansson
da77c52806 Add Tag to mainline_system
Needed for NFC. Has a proprietary override, which is the
only reason I had not added it earlier.

Test: make
Bug: 80410283
Change-Id: I1fad3d2bab0ff2fa8bbd32388049f0f8c86b68a5
2019-01-03 16:50:58 +00:00
Pawin Vongmasa
24584d1c04 Add Codec2 to mainline_system
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 112362730
Bug: 119853704
Change-Id: I563748d4cea04ab09f03109fa8fa7697d35de581
2018-12-06 07:40:18 -08:00
Anton Hansson
5fbe6abfb7 Merge "Add llkd to mainline_system" 2018-11-30 10:33:44 +00:00
Anton Hansson
3b11910bfb Add two compile flags for mainline
- LMKD_LOG_STATS being false is a disk-saving flag not suitable
  for mainline
- USE_HWC2 should likely be cleaned up, but toggles some timing
  behavior in libhwui

Bug: 80410283
Test: build mainline_system_arm64
Change-Id: I8a1be50bd2cc48405656cd1daad8e8a1ca555871
2018-11-29 10:10:42 +00:00
Anton Hansson
1f6e024bcc Add two more libraries to mainline_system
Bug: 80410283
Test: make
Change-Id: I479396b24b1a551afd591da9f4f550eb0a74b540
2018-11-26 17:08:07 +00:00
Anton Hansson
6d8a179cf1 Add a bunch of libraries to mainline_system
These are libraries commonly depended on by things on the product
partition. Add them explicitly for now.

Bug: 80410283
Test: build mainline_system_arm64
Change-Id: I6696990243397aa7109f88951ff120acf2a0f7e8
2018-11-20 14:53:09 +00:00
Anton Hansson
08d4227898 Merge "Add libfwdlockengine to mainline_system" 2018-11-15 09:01:16 +00:00
Anton Hansson
a194a83e56 Merge "Add TimeZoneUpdater apk to mainline /system" 2018-11-14 08:59:23 +00:00
Anton Hansson
8879840c52 Add llkd to mainline_system
Bug: 110410711
Test: lunch mainline_arm64; m
Change-Id: Idb42e91ee9dcb91a0ca5c0e3eabf293a1213ff32
2018-11-13 15:19:34 +00:00
Anton Hansson
8af128d703 Add libfwdlockengine to mainline_system
Required by certain ringtones, apparently (though I couldn't find
what actually uses this library).

Bug: 80410283
Test: lunch mainline_arm64; m
Change-Id: I36b5b07156b41c442903d7d07e6b9d9f4abe2345
2018-11-06 17:29:32 +00:00
Anton Hansson
cac5bff8ae Add TimeZoneUpdater apk to mainline /system
This is disabled by default, but can be enabled via a
config overlay.

Bug: 116191025
Bug: 80410283
Test: make
Change-Id: Ibfe5d85580ccccc774de166750d91efd74458a8d
2018-11-06 11:23:29 +00:00
Anton Hansson
3ae69f2990 Add list of locales to mainline_system
Locales not in this list will get stripped.

Bug: 80410283
Test: lunch mainline_arm64; m
Change-Id: I90a63e234e2f2ee32da8f9f257248f5ee6354151
Merged-In: I90a63e234e2f2ee32da8f9f257248f5ee6354151
(cherry picked from commit d994b0dc98)
2018-10-30 08:54:30 +00:00
Anton Hansson
058f33ec0f Merge "Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system" 2018-10-18 15:32:47 +00:00
Anton Hansson
b65a5ba193 Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system
Let this be defined in the leaves instead. As is it frequently causes
problems where the product inheriting this also inherit another value
of PRODUCT_SHIPPING_API_LEVEL, leading to invalid values unless
overridden again.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Test: lunch mainline_system_arm64; m nothing
Change-Id: Id08b6cc0cd8815404e548c521c9e40706ba8ca16
2018-10-18 13:40:22 +01:00
Anton Hansson
fc1e1a54cd Merge "Add PresencePolling to mainline_system" 2018-10-18 08:04:19 +00:00
Anton Hansson
471a45b952 Merge "Re-submit "Add trailing slash to mainline path claims."" 2018-10-18 08:03:53 +00:00
Anton Hansson
da02e8619a Add PresencePolling to mainline_system
Missed adding this app in I5afabc7dcc4ca320f06fdc4a2669fb1b81e53b0b.
It is usually added in conjunction with RcsService.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic721d1dcef479a03f4b603bd77a91801ea9dd9ec
2018-10-17 18:04:46 +01:00
Anton Hansson
dcb5ef1333 Re-submit "Add trailing slash to mainline path claims."
With a workaround for preopt files that get installed into an unknown
path. The BoardConfig defines whether the files go in /system_other,
so allow that.

This reverts commit 46bf4b510c.

Test: lunch mainline_arm64-userdebug; m nothing
Change-Id: Ia75670eb6e3730ad0ff17f5b81954b69f6cab22b
2018-10-17 16:40:29 +01:00
Anton Hansson
28e0f0353c Fix typo
We want to add to PRODUCT_PACKAGES_DEBUG, not overwrite it.

Test: make
Change-Id: Ib67d20e33b30edd76ca24ce208f899cb4c25004c
2018-10-17 09:08:27 +01:00
Anton Hansson
7f758720f6 Merge "Add some debug binaries to mainline_system" 2018-10-17 07:23:18 +00:00
Anton Hansson
bb449e0bd4 Merge "Add the default charger images to mainline_system" 2018-10-17 07:20:54 +00:00
Tom Cherry
6195b3578a Separate init packaging for mainline
With system-as-root, both first and second stage init belong to
system, but without system-as-root, first stage belongs to vendor and
second stage belongs to system.  This change references two phony
packages that include the right parts of init for systen and vendor.

Bug: 117606184
Test: mainline builds work properly
Change-Id: I997309655fef28cb1c3d4b3be989c035b5c6488d
2018-10-16 09:58:54 -07:00
Anton Hansson
aa236882c0 Add the default charger images to mainline_system
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I539b57ef436be3d6209d6436fae6c5eb75832bf7
2018-10-16 17:34:33 +01:00
Anton Hansson
36c5d0d1cc Add some debug binaries to mainline_system
These binaries are commonly included in debug builds, so include
them on mainline too.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: If0adfb4795ea82e158a0218d9c16d897012dd8b5
2018-10-16 16:15:39 +01:00
Anton Hansson
46bf4b510c Revert "Add trailing slash to mainline path claims."
This reverts commit f1fb31a301.

Reason for revert: breaks some builds

Change-Id: I22f7939dc25bee6e3c2b8835f86ce5772ab3edec
2018-10-15 10:13:35 +00:00
Anton Hansson
f1fb31a301 Add trailing slash to mainline path claims.
Fixes a bug where system_other/ paths are considered part of
the "system" path.

Test: lunch mainline_arm64; m nothing
Change-Id: Id7aad41ea285f545260289f59e55c251677bdc38
2018-10-12 11:10:17 +01:00
Tom Cherry
16f45d6cd9 Whitelist TARGET_COPY_OUT_RAMDISK for mainline
Test: mainline builds without BOARD_BUILD_SYSTEM_ROOT_IMAGE set.
Change-Id: Ia3a5bfa6d2ba1872710409d8c88bba6ff710a1c6
2018-10-09 10:41:01 -07:00
Anton Hansson
65fd432a91 Merge "Add a few apps to mainline_system." 2018-10-03 10:32:57 +00:00
Anton Hansson
0820a93d69 Merge "Add wrapped net utils to mainline_system." 2018-10-01 17:22:05 +00:00
Anton Hansson
c941007331 Add bluetooth libraries to mainline_system.
These are included on current mainline devices.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I1c214c760f3f668804baef642f1c7121d0723bfb
2018-10-01 10:55:35 +00:00
Anton Hansson
017e68e6cd Add a few apps to mainline_system.
- LiveWallPapersPicker is included virtually everywhere
- PartnerBookmarksProvider is required by other apps
- SafetyRegulatoryInfo shows html content from a res overlay
- DMService, RcsService and Stk are all telephony apps
  of some sort.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I5afabc7dcc4ca320f06fdc4a2669fb1b81e53b0b
2018-10-01 11:54:22 +01:00
Anton Hansson
2df4bce8b8 Add wrapped net utils to mainline_system.
For /vendor to access net utils.

Test: lunch mainline_arm64; m nothing
Bug: 80410283
Change-Id: I317ed0f70271af6304d71ed669e7d1b17b3e19c0
2018-10-01 11:45:22 +01:00
Anton Hansson
bfa4338842 Add the nfc_extras shared lib to mainline.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I5bdc32988ced9c0b93bb54bc8cb88ead7efe4fcb
2018-09-28 15:14:59 +01:00
Anton Hansson
deec280bbb Add preopt scripts to mainline.
These scripts support art preopting in system_other, which is
a generically useful thing to keep on mainline.

Note that the preloads_copy script should also be added, but
that needs some work to be done (b/116714695).

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I693e17ac0f61f2417ced639d1fdfe164c54341a9
2018-09-27 11:18:11 +01:00