diff options
author | Anton Hansson | 2018-06-15 05:35:46 -0500 |
---|---|---|
committer | Anton Hansson | 2018-06-20 08:42:30 -0500 |
commit | 19fc0e3c2bf4b81cbcfa986b1826a8a423532154 (patch) | |
tree | 292a7c4b805d2e790bbecbdf8e5b0ce2eb65d8ae /target/product/generic_no_telephony.mk | |
parent | 52b38791b72cf6391ee091481e753312b2b07e98 (diff) | |
download | platform-build-19fc0e3c2bf4b81cbcfa986b1826a8a423532154.tar.gz platform-build-19fc0e3c2bf4b81cbcfa986b1826a8a423532154.tar.xz platform-build-19fc0e3c2bf4b81cbcfa986b1826a8a423532154.zip |
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 57000e3c79a2bdbdb0244481e636a5b137a5d36b)
Diffstat (limited to 'target/product/generic_no_telephony.mk')
-rw-r--r-- | target/product/generic_no_telephony.mk | 82 |
1 files changed, 62 insertions, 20 deletions
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 9ab6df059..5e6957a2d 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk | |||
@@ -18,38 +18,80 @@ | |||
18 | # It includes the base Android platform. | 18 | # It includes the base Android platform. |
19 | 19 | ||
20 | PRODUCT_PACKAGES := \ | 20 | PRODUCT_PACKAGES := \ |
21 | audio.primary.default \ | ||
22 | BasicDreams \ | ||
23 | BlockedNumberProvider \ | ||
21 | Bluetooth \ | 24 | Bluetooth \ |
22 | BluetoothMidiService \ | 25 | BluetoothMidiService \ |
26 | BookmarkProvider \ | ||
27 | Browser2 \ | ||
28 | BuiltInPrintService \ | ||
29 | Calendar \ | ||
30 | CalendarProvider \ | ||
23 | Camera2 \ | 31 | Camera2 \ |
32 | CaptivePortalLogin \ | ||
33 | CertInstaller \ | ||
34 | clatd \ | ||
35 | clatd.conf \ | ||
36 | Contacts \ | ||
37 | DeskClock \ | ||
38 | DocumentsUI \ | ||
39 | DownloadProviderUi \ | ||
40 | EasterEgg \ | ||
41 | Email \ | ||
42 | ExactCalculator \ | ||
43 | ExternalStorageProvider \ | ||
44 | FusedLocation \ | ||
24 | Gallery2 \ | 45 | Gallery2 \ |
46 | InputDevices \ | ||
47 | KeyChain \ | ||
48 | Keyguard \ | ||
49 | LatinIME \ | ||
50 | Launcher3QuickStep \ | ||
51 | librs_jni \ | ||
52 | libvideoeditor_core \ | ||
53 | libvideoeditor_jni \ | ||
54 | libvideoeditor_osal \ | ||
55 | libvideoeditorplayer \ | ||
56 | libvideoeditor_videofilters \ | ||
57 | local_time.default \ | ||
58 | ManagedProvisioning \ | ||
59 | MmsService \ | ||
60 | MtpDocumentsProvider \ | ||
25 | Music \ | 61 | Music \ |
26 | MusicFX \ | 62 | MusicFX \ |
27 | NfcNci \ | 63 | NfcNci \ |
28 | OneTimeInitializer \ | 64 | OneTimeInitializer \ |
65 | PacProcessor \ | ||
66 | power.default \ | ||
67 | PrintRecommendationService \ | ||
68 | PrintSpooler \ | ||
29 | Provision \ | 69 | Provision \ |
70 | ProxyHandler \ | ||
71 | QuickSearchBox \ | ||
72 | screenrecord \ | ||
73 | SecureElement \ | ||
74 | Settings \ | ||
75 | SettingsIntelligence \ | ||
76 | SharedStorageBackup \ | ||
77 | SimAppDialog \ | ||
78 | StorageManager \ | ||
30 | SystemUI \ | 79 | SystemUI \ |
31 | SysuiDarkThemeOverlay \ | 80 | SysuiDarkThemeOverlay \ |
32 | EasterEgg \ | 81 | Telecom \ |
33 | WallpaperCropper | 82 | TeleService \ |
34 | 83 | Traceur \ | |
35 | PRODUCT_PACKAGES += \ | 84 | vibrator.default \ |
36 | clatd \ | 85 | VpnDialogs \ |
37 | clatd.conf \ | 86 | vr \ |
38 | screenrecord | 87 | WallpaperCropper \ |
39 | 88 | ||
40 | PRODUCT_PACKAGES += \ | ||
41 | librs_jni \ | ||
42 | libvideoeditor_jni \ | ||
43 | libvideoeditor_core \ | ||
44 | libvideoeditor_osal \ | ||
45 | libvideoeditor_videofilters \ | ||
46 | libvideoeditorplayer \ | ||
47 | 89 | ||
48 | PRODUCT_PACKAGES += \ | 90 | PRODUCT_SYSTEM_SERVER_APPS += \ |
49 | audio.primary.default \ | 91 | FusedLocation \ |
50 | local_time.default \ | 92 | InputDevices \ |
51 | vibrator.default \ | 93 | KeyChain \ |
52 | power.default | 94 | Telecom \ |
53 | 95 | ||
54 | PRODUCT_COPY_FILES := \ | 96 | PRODUCT_COPY_FILES := \ |
55 | frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf | 97 | frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf |
@@ -67,7 +109,7 @@ $(call inherit-product-if-exists, external/roboto-fonts/fonts.mk) | |||
67 | $(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk) | 109 | $(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk) |
68 | $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk) | 110 | $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk) |
69 | $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk) | 111 | $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk) |
70 | $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) | 112 | $(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk) |
71 | 113 | ||
72 | # Overrides | 114 | # Overrides |
73 | PRODUCT_BRAND := generic | 115 | PRODUCT_BRAND := generic |