summaryrefslogtreecommitdiffstats
path: root/products
diff options
context:
space:
mode:
authorJi-Hwan Lee <jihwan@google.com>2014-05-08 15:59:52 +0900
committerJi-Hwan Lee <jihwan@google.com>2014-05-08 15:59:52 +0900
commit0a4735560f43e50e81a7649a3fdda3f45240a375 (patch)
treefab645a61b6f20cada8a717198b4b9036b6b3454 /products
parentb5a84416da3dd4b857558f87488963112533da25 (diff)
downloadandroid_device_google_atv-0a4735560f43e50e81a7649a3fdda3f45240a375.tar.gz
android_device_google_atv-0a4735560f43e50e81a7649a3fdda3f45240a375.tar.bz2
android_device_google_atv-0a4735560f43e50e81a7649a3fdda3f45240a375.zip
Add TV related packages to userdebug and eng build
Also, adjust packages according to recent changes in build/target/product. Change-Id: Ia097b5abf2d7bca1f32c3382e3e380ff05d929e8
Diffstat (limited to 'products')
-rw-r--r--products/atv_base.mk21
-rw-r--r--products/atv_generic.mk4
2 files changed, 12 insertions, 13 deletions
diff --git a/products/atv_base.mk b/products/atv_base.mk
index 3333bac..d10239e 100644
--- a/products/atv_base.mk
+++ b/products/atv_base.mk
@@ -14,15 +14,11 @@
# limitations under the License.
#
-# There packages are still in experimental repository.
-# TODO: Add back when build recovers.
-#PRODUCT_PACKAGES := \
-# AtscTvInput \
-# SampleTvInput \
-# TV \
-# TvProvider
-
-PRODUCT_PACKAGES := \
+# For now, include TV related packages only for non-user builds.
+# TODO: Add to user build when ready.
+PRODUCT_PACKAGES_DEBUG := \
+ TV \
+ TvProvider \
tv_input.default
PRODUCT_COPY_FILES := \
@@ -36,7 +32,6 @@ PRODUCT_PACKAGES += \
ContactsProvider \
DefaultContainerService \
UserDictionaryProvider \
- atrace \
libaudiopreprocessing \
libfilterpack_imageproc \
libgabi++ \
@@ -60,8 +55,7 @@ PRODUCT_PACKAGES += \
libstagefright_soft_vpxdec \
libstagefright_soft_vpxenc \
mdnsd \
- requestsync \
- screenrecord
+ requestsync
# From build/target/product/core.mk
PRODUCT_PACKAGES += \
@@ -86,7 +80,8 @@ PRODUCT_PACKAGES += \
librs_jni \
audio.primary.default \
audio_policy.default \
- local_time.default
+ local_time.default \
+ screenrecord
PRODUCT_COPY_FILES += \
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
diff --git a/products/atv_generic.mk b/products/atv_generic.mk
index 0971ebc..f7794f5 100644
--- a/products/atv_generic.mk
+++ b/products/atv_generic.mk
@@ -14,6 +14,10 @@
# limitations under the License.
#
+PRODUCT_PACKAGES_DEBUG := \
+ AtscTvInput \
+ SampleTvInput
+
PRODUCT_COPY_FILES := \
$(foreach f,$(wildcard device/google/atv/skins/AndroidTV/*),$(f):skin/$(notdir $(f)))