Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ad49ae6 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Clean up the common base core.mk of the sdk and the aosp_* products."

parents e189a141 2cebe0ba

target/product/core.mk

+16 −0
Original line number Diff line number Diff line
@@ -22,15 +22,31 @@ 
PRODUCT_PACKAGES += \

    BasicDreams \

    Browser \

    Calculator \

    Calendar \

    CalendarProvider \

    CertInstaller \

    Contacts \

    DeskClock \

    DocumentsUI \

    DownloadProviderUi \

    Email \

    Exchange2 \

    ExternalStorageProvider \

    FusedLocation \

    InputDevices \

    KeyChain \

    Keyguard \

    LatinIME \

    Launcher2 \

    PicoTts \

    PacProcessor \

    PrintSpooler \

    ProxyHandler \

    QuickSearchBox \

    Settings \

    SharedStorageBackup \

    TeleService \

    VpnDialogs



$(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk)

target/product/core_tiny.mk

+1 −2
Original line number Diff line number Diff line
@@ -81,11 +81,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ 


MINIMAL_FONT_FOOTPRINT := true



$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)

$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)



# Overrides

PRODUCT_BRAND := tiny

PRODUCT_DEVICE := tiny

PRODUCT_NAME := core_tiny
 


$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)

target/product/generic_no_telephony.mk

+0 −16
Original line number Diff line number Diff line
@@ -18,30 +18,14 @@ 
# It includes the base Android platform.



PRODUCT_PACKAGES := \

    DeskClock \

    Bluetooth \

    Calculator \

    Calendar \

    Camera2 \

    CertInstaller \

    Email \

    Exchange2 \

    FusedLocation \

    Gallery2 \

    InputDevices \

    Keyguard \

    LatinIME \

    Launcher2 \

    Music \

    MusicFX \

    OneTimeInitializer \

    PrintSpooler \

    Provision \

    QuickSearchBox \

    Settings \

    SystemUI \

    TeleService \

    CalendarProvider \

    bluetooth-health \

    hostapd \

    wpa_supplicant.conf \

target/product/sdk.mk

+33 −49
Original line number Diff line number Diff line
@@ -17,51 +17,35 @@ 
PRODUCT_PROPERTY_OVERRIDES :=



PRODUCT_PACKAGES := \

	Calculator \

	DeskClock \

	Email \

	Exchange2 \

	FusedLocation \

	ApiDemos \

	ConnectivityTest \

	CubeLiveWallpapers \

	CustomLocale \

	Development \

	DevelopmentSettings \

	Fallback \

	Gallery \

	Keyguard \

	Music \

	Mms \

	OpenWnn \

	PrintSpooler \

	GestureBuilder \

	GpsLocationTest \

	LegacyCamera \

	librs_jni \

	libwnndict \

	libWnnEngDic \

	libWnnJpnDic \

	libwnndict \

	TeleService \

	LiveWallpapersPicker \

	Mms \

	Music \

	OpenWnn \

	PinyinIME \

	Protips \

	SoftKeyboard \

	SystemUI \

	Launcher2 \

	Development \

	DevelopmentSettings \

	Fallback \

	Settings \

	rild \

	SdkSetup \

	CustomLocale \

	sqlite3 \

	InputDevices \

	LatinIME \

	CertInstaller \

	LiveWallpapersPicker \

	ApiDemos \

	GestureBuilder \

	CubeLiveWallpapers \

	QuickSearchBox \

	WidgetPreview \

	librs_jni \

	ConnectivityTest \

	GpsLocationTest \

	CalendarProvider \

	Calendar \

	SmokeTest \

	SmokeTestApp \

	rild \

	LegacyCamera

	SoftKeyboard \

	sqlite3 \

	SystemUI \

	WidgetPreview



# Define the host tools and libs that are parts of the SDK.

-include sdk/build/product_sdk.mk
@@ -95,14 +79,17 @@ $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk) 
$(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)



# Overrides

PRODUCT_BRAND := generic

PRODUCT_NAME := sdk

PRODUCT_DEVICE := generic

# include available languages for TTS in the system image

-include external/svox/pico/lang/PicoLangDeDeInSystem.mk

-include external/svox/pico/lang/PicoLangEnGBInSystem.mk

-include external/svox/pico/lang/PicoLangEnUsInSystem.mk

-include external/svox/pico/lang/PicoLangEsEsInSystem.mk

-include external/svox/pico/lang/PicoLangFrFrInSystem.mk

-include external/svox/pico/lang/PicoLangItItInSystem.mk



# locale + densities. en_US is both first and in alphabetical order to

# ensure this is the default locale.

PRODUCT_LOCALES = \

PRODUCT_LOCALES := \

	en_US \

	ldpi \

	hdpi \
@@ -166,10 +153,7 @@ PRODUCT_LOCALES = \ 
	zh_CN \

	zh_TW



# include available languages for TTS in the system image

-include external/svox/pico/lang/PicoLangDeDeInSystem.mk

-include external/svox/pico/lang/PicoLangEnGBInSystem.mk

-include external/svox/pico/lang/PicoLangEnUsInSystem.mk

-include external/svox/pico/lang/PicoLangEsEsInSystem.mk

-include external/svox/pico/lang/PicoLangFrFrInSystem.mk

-include external/svox/pico/lang/PicoLangItItInSystem.mk
 
# Overrides

PRODUCT_BRAND := generic

PRODUCT_NAME := sdk

PRODUCT_DEVICE := generic

target/product/sdk_x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
# build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



include $(SRC_TARGET_DIR)/product/sdk.mk

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)



# Overrides

PRODUCT_BRAND := generic_x86