From 6c30f0e83ece4b876d2fe75637b5a892fc4f6257 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Sat, 19 Jul 2014 10:26:18 -0700 Subject: Normalize atv sdk product names to sdk_atv_ Also use PRODUCT_IS_ATV_SDK to indicate current is an atv SDK build. Bug: 16216170 Change-Id: Iabc1f60bc7f7e6cfe13c52759e1ddabf0eab9908 --- products/atv_sdk.mk | 65 --------------------------------------------- products/atv_sdk_x86.mk | 22 ---------------- products/sdk_atv_armv7.mk | 67 +++++++++++++++++++++++++++++++++++++++++++++++ products/sdk_atv_x86.mk | 23 ++++++++++++++++ 4 files changed, 90 insertions(+), 87 deletions(-) delete mode 100644 products/atv_sdk.mk delete mode 100644 products/atv_sdk_x86.mk create mode 100644 products/sdk_atv_armv7.mk create mode 100644 products/sdk_atv_x86.mk (limited to 'products') diff --git a/products/atv_sdk.mk b/products/atv_sdk.mk deleted file mode 100644 index 40cf5f4..0000000 --- a/products/atv_sdk.mk +++ /dev/null @@ -1,65 +0,0 @@ -# -# 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. -# 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_PACKAGES := \ - EmulatorSmokeTests \ - TelephonyProvider \ - audio.primary.goldfish \ - rild - -DEVICE_PACKAGE_OVERLAYS := \ - device/google/atv/sdk_overlay \ - development/sdk_overlay - -PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ - device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.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 \ - hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf - -# Put en_US first in the list, so make it default. -PRODUCT_LOCALES := en_US - -# Include drawables for various densities. -PRODUCT_AAPT_CONFIG := normal large xlarge tvdpi hdpi xhdpi xxhdpi - -# Add TV skins to SDK, in addition to (not replacing) original SDK tree -PRODUCT_SDK_ATREE_FILES := \ - development/build/sdk.atree \ - device/google/atv/sdk/atv_sdk.atree - -# Define the host tools and libs that are parts of the SDK. --include sdk/build/product_sdk.mk --include development/build/product_sdk.mk - -include $(SRC_TARGET_DIR)/product/emulator.mk - -$(call inherit-product, device/google/atv/products/atv_base.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 - -# Overrides -PRODUCT_NAME := atv_sdk -PRODUCT_DEVICE := generic -PRODUCT_BRAND := generic diff --git a/products/atv_sdk_x86.mk b/products/atv_sdk_x86.mk deleted file mode 100644 index 0feaac0..0000000 --- a/products/atv_sdk_x86.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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. -# 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. -# - -$(call inherit-product, device/google/atv/products/atv_sdk.mk) - -# Overrides -PRODUCT_NAME := atv_sdk_x86 -PRODUCT_DEVICE := generic_x86 -PRODUCT_BRAND := generic_x86 diff --git a/products/sdk_atv_armv7.mk b/products/sdk_atv_armv7.mk new file mode 100644 index 0000000..ba91ccf --- /dev/null +++ b/products/sdk_atv_armv7.mk @@ -0,0 +1,67 @@ +# +# 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. +# 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_IS_ATV_SDK := true + +PRODUCT_PACKAGES := \ + EmulatorSmokeTests \ + TelephonyProvider \ + audio.primary.goldfish \ + rild + +DEVICE_PACKAGE_OVERLAYS := \ + device/google/atv/sdk_overlay \ + development/sdk_overlay + +PRODUCT_COPY_FILES := \ + device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.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 \ + hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf + +# Put en_US first in the list, so make it default. +PRODUCT_LOCALES := en_US + +# Include drawables for various densities. +PRODUCT_AAPT_CONFIG := normal large xlarge tvdpi hdpi xhdpi xxhdpi + +# Add TV skins to SDK, in addition to (not replacing) original SDK tree +PRODUCT_SDK_ATREE_FILES := \ + development/build/sdk.atree \ + device/google/atv/sdk/atv_sdk.atree + +# Define the host tools and libs that are parts of the SDK. +-include sdk/build/product_sdk.mk +-include development/build/product_sdk.mk + +include $(SRC_TARGET_DIR)/product/emulator.mk + +$(call inherit-product, device/google/atv/products/atv_base.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 + +# Overrides +PRODUCT_NAME := sdk_atv_armv7 +PRODUCT_DEVICE := generic +PRODUCT_BRAND := generic diff --git a/products/sdk_atv_x86.mk b/products/sdk_atv_x86.mk new file mode 100644 index 0000000..aa4fb7e --- /dev/null +++ b/products/sdk_atv_x86.mk @@ -0,0 +1,23 @@ +# +# 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. +# 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. +# + +# TODO: separate out a common base for arm/x86 atv SDK build. +$(call inherit-product, device/google/atv/products/sdk_atv_armv7.mk) + +# Overrides +PRODUCT_NAME := sdk_atv_x86 +PRODUCT_DEVICE := generic_x86 +PRODUCT_BRAND := generic_x86 -- cgit v1.2.3