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

Commit 1f371a1f authored by Ying Wang's avatar Ying Wang
Browse files

Normalize SDK product name to sdk_<device_type>_<arch_name> 

Put the common pieces in sdk_base.mk.
Still keep the old names as aliases.
Bug: 16216170

Change-Id: I39a438843c8b09df1aafff142bd9987962f11ef8
parent 42218736

target/product/AndroidProducts.mk

+7 −2
Original line number Diff line number Diff line
@@ -61,10 +61,15 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/aosp_x86_64.mk \

    $(LOCAL_DIR)/full_x86_64.mk \

    $(LOCAL_DIR)/vbox_x86.mk \

    $(LOCAL_DIR)/sdk_phone_armv7.mk \

    $(LOCAL_DIR)/sdk_phone_x86.mk \

    $(LOCAL_DIR)/sdk_phone_mips.mk \

    $(LOCAL_DIR)/sdk_phone_arm64.mk \

    $(LOCAL_DIR)/sdk_phone_x86_64.mk \

    $(LOCAL_DIR)/sdk_phone_mips64.mk \

    $(LOCAL_DIR)/sdk.mk \

    $(LOCAL_DIR)/sdk_x86.mk \

    $(LOCAL_DIR)/sdk_mips.mk \

    $(LOCAL_DIR)/sdk_arm64.mk \

    $(LOCAL_DIR)/sdk_x86_64.mk \

    $(LOCAL_DIR)/sdk_mips64.mk

    $(LOCAL_DIR)/sdk_x86_64.mk

endif

target/product/sdk.mk

+3 −149
Original line number Diff line number Diff line 
#

# Copyright (C) 2007 The Android Open Source Project

# Copyright (C) 2014 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -14,154 +14,8 @@ 
# limitations under the License.

#



PRODUCT_PROPERTY_OVERRIDES :=

# Don't modify this file - It's just an alias!



PRODUCT_PACKAGES := \

	ApiDemos \

	CubeLiveWallpapers \

	CustomLocale \

	Development \

	DevelopmentSettings \

	Dialer \

	EmulatorSmokeTests \

	Fallback \

	Gallery \

	GestureBuilder \

	LegacyCamera \

	librs_jni \

	libwnndict \

	libWnnEngDic \

	libWnnJpnDic \

	LiveWallpapersPicker \

	Mms \

	Music \

	OpenWnn \

	PinyinIME \

	Protips \

	rild \

	SdkSetup \

	SmokeTest \

	SmokeTestApp \

	SoftKeyboard \

	sqlite3 \

	SystemUI \

	WidgetPreview

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



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

-include sdk/build/product_sdk.mk

-include development/build/product_sdk.mk



# audio libraries.

PRODUCT_PACKAGES += \

	audio.primary.goldfish \

	audio_policy.default \

	local_time.default



PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay



PRODUCT_COPY_FILES := \

	device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

	frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \

	frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \

	frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \

	device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \

	frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \

	frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \

	frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \

	device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \

	frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \

	frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \

	frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \

	hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf



include $(SRC_TARGET_DIR)/product/emulator.mk



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

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

$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)

$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)

$(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)

$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)

$(call inherit-product-if-exists, external/naver-fonts/fonts.mk)

$(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)



# 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 := \

	en_US \

	ldpi \

	hdpi \

	mdpi \

	xhdpi \

	ar_EG \

	ar_IL \

	bg_BG \

	ca_ES \

	cs_CZ \

	da_DK \

	de_AT \

	de_CH \

	de_DE \

	de_LI \

	el_GR \

	en_AU \

	en_CA \

	en_GB \

	en_IE \

	en_IN \

	en_NZ \

	en_SG \

	en_US \

	en_ZA \

	es_ES \

	es_US \

	fi_FI \

	fr_BE \

	fr_CA \

	fr_CH \

	fr_FR \

	he_IL \

	hi_IN \

	hr_HR \

	hu_HU \

	id_ID \

	it_CH \

	it_IT \

	ja_JP \

	ko_KR \

	lt_LT \

	lv_LV \

	nb_NO \

	nl_BE \

	nl_NL \

	pl_PL \

	pt_BR \

	pt_PT \

	ro_RO \

	ru_RU \

	sk_SK \

	sl_SI \

	sr_RS \

	sv_SE \

	th_TH \

	tl_PH \

	tr_TR \

	uk_UA \

	vi_VN \

	zh_CN \

	zh_TW



# Overrides

PRODUCT_BRAND := generic

PRODUCT_NAME := sdk
 
PRODUCT_DEVICE := generic

target/product/sdk_arm64.mk

+3 −11
Original line number Diff line number Diff line 
#

# Copyright (C) 2009 The Android Open Source Project

# Copyright (C) 2014 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -14,16 +14,8 @@ 
# limitations under the License.

#



# This is a build configuration for a full-featured build of the

# Open-Source part of the tree. It's geared toward a US-centric

# build quite specifically for the emulator, and might not be

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

# Don't modify this file - It's just an alias!



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

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

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



# Overrides

PRODUCT_BRAND := generic_arm64

PRODUCT_NAME := sdk_arm64
 
PRODUCT_DEVICE := generic_arm64

PRODUCT_MODEL := Android SDK built for arm64

target/product/sdk_base.mk

0 → 100644
+162 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2007 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



PRODUCT_PROPERTY_OVERRIDES :=



PRODUCT_PACKAGES := \

	ApiDemos \

	CubeLiveWallpapers \

	CustomLocale \

	Development \

	DevelopmentSettings \

	Dialer \

	EmulatorSmokeTests \

	Fallback \

	Gallery \

	GestureBuilder \

	LegacyCamera \

	librs_jni \

	libwnndict \

	libWnnEngDic \

	libWnnJpnDic \

	LiveWallpapersPicker \

	Mms \

	Music \

	OpenWnn \

	PinyinIME \

	Protips \

	rild \

	SdkSetup \

	SmokeTest \

	SmokeTestApp \

	SoftKeyboard \

	sqlite3 \

	SystemUI \

	WidgetPreview



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

-include sdk/build/product_sdk.mk

-include development/build/product_sdk.mk



# audio libraries.

PRODUCT_PACKAGES += \

	audio.primary.goldfish \

	audio_policy.default \

	local_time.default



PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay



PRODUCT_COPY_FILES := \

	device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

	frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \

	frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \

	frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \

	device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \

	frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \

	frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \

	frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \

	device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \

	frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \

	frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \

	frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \

	hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf



include $(SRC_TARGET_DIR)/product/emulator.mk



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

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

$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)

$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)

$(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)

$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)

$(call inherit-product-if-exists, external/naver-fonts/fonts.mk)

$(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)



# 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 := \

	en_US \

	ldpi \

	hdpi \

	mdpi \

	xhdpi \

	ar_EG \

	ar_IL \

	bg_BG \

	ca_ES \

	cs_CZ \

	da_DK \

	de_AT \

	de_CH \

	de_DE \

	de_LI \

	el_GR \

	en_AU \

	en_CA \

	en_GB \

	en_IE \

	en_IN \

	en_NZ \

	en_SG \

	en_US \

	en_ZA \

	es_ES \

	es_US \

	fi_FI \

	fr_BE \

	fr_CA \

	fr_CH \

	fr_FR \

	he_IL \

	hi_IN \

	hr_HR \

	hu_HU \

	id_ID \

	it_CH \

	it_IT \

	ja_JP \

	ko_KR \

	lt_LT \

	lv_LV \

	nb_NO \

	nl_BE \

	nl_NL \

	pl_PL \

	pt_BR \

	pt_PT \

	ro_RO \

	ru_RU \

	sk_SK \

	sl_SI \

	sr_RS \

	sv_SE \

	th_TH \

	tl_PH \

	tr_TR \

	uk_UA \

	vi_VN \

	zh_CN \

	zh_TW

target/product/sdk_mips.mk

+3 −10
Original line number Diff line number Diff line 
#

# Copyright (C) 2012 The Android Open Source Project

# Copyright (C) 2014 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -14,15 +14,8 @@ 
# limitations under the License.

#



# This is a build configuration for a full-featured build of the

# Open-Source part of the tree. It's geared toward a US-centric

# build quite specifically for the emulator, and might not be

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

# Don't modify this file - It's just an alias!



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

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



# Overrides

PRODUCT_BRAND := generic_mips

PRODUCT_NAME := sdk_mips
 
PRODUCT_DEVICE := generic_mips

PRODUCT_MODEL := Android SDK for Mips