diff options
| author | Ji-Hwan Lee <jihwan@google.com> | 2014-05-17 01:19:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-17 01:19:37 +0000 |
| commit | 6775bf685dbf9aef8d55d0c7ff4958a0987eacb3 (patch) | |
| tree | 3c89961bb34bf3efb6242eaefff47dbc2835d60f /products | |
| parent | ccff2b7eb4e1240018abd0faf0b1c1732b211806 (diff) | |
| parent | b8c6b8352bc090b66515134e2f04e4028f8ae382 (diff) | |
| download | android_device_google_atv-6775bf685dbf9aef8d55d0c7ff4958a0987eacb3.tar.gz android_device_google_atv-6775bf685dbf9aef8d55d0c7ff4958a0987eacb3.tar.bz2 android_device_google_atv-6775bf685dbf9aef8d55d0c7ff4958a0987eacb3.zip | |
Merge "Make proper ATV SDK build"
Diffstat (limited to 'products')
| -rw-r--r-- | products/atv_sdk.mk | 5 | ||||
| -rw-r--r-- | products/atv_skins.atree | 18 |
2 files changed, 3 insertions, 20 deletions
diff --git a/products/atv_sdk.mk b/products/atv_sdk.mk index e4991fb..8e264e3 100644 --- a/products/atv_sdk.mk +++ b/products/atv_sdk.mk @@ -15,7 +15,8 @@ # PRODUCT_PACKAGES := \ - audio.primary.goldfish + audio.primary.goldfish \ + EmulatorSmokeTests PRODUCT_PACKAGE_OVERLAYS := \ device/google/atv/sdk_overlay \ @@ -36,7 +37,7 @@ 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/products/atv_skins.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 diff --git a/products/atv_skins.atree b/products/atv_skins.atree deleted file mode 100644 index 3aa0e21..0000000 --- a/products/atv_skins.atree +++ /dev/null @@ -1,18 +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. -# - -# Android TV skins -device/google/atv/skins/AndroidTV system-images/${PLATFORM_NAME}/armeabi-v7a/skins/AndroidTV |