summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-05-21 20:05:34 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-05-21 20:05:34 +0000
commite0d9e5e355b587b06ccb59594feaf2b573b216b6 (patch)
tree1c95566adae39c7bea45d389a4a99abba54dd24f
parent30fb1dd901fe7c41625e6f8958cf2b8d77b74d62 (diff)
parent7e05b83b82f4da3a2b5cdf2c729b72f9a8bc2886 (diff)
downloadfugu-sdk-release.tar.gz
Snap for 4794708 from 7e05b83b82f4da3a2b5cdf2c729b72f9a8bc2886 to sdk-releasesdk-release
Change-Id: I59705e11cfb6197f15ed53e573e989275d42f461
-rw-r--r--AndroidProducts.mk4
-rw-r--r--manifest.xml8
-rw-r--r--vendorsetup.sh18
3 files changed, 8 insertions, 22 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 3fe4d34..374bf64 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,3 +17,7 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_fugu.mk \
$(LOCAL_DIR)/full_fugu.mk
+
+COMMON_LUNCH_CHOICES := \
+ full_fugu-userdebug \
+ aosp_fugu-userdebug
diff --git a/manifest.xml b/manifest.xml
index a2e627d..cf3f2d7 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -11,7 +11,7 @@
</hal>
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
- <transport arch="32+64">passthrough</transport>
+ <transport arch="32">passthrough</transport>
<version>2.1</version>
<interface>
<name>IComposer</name>
@@ -20,7 +20,7 @@
</hal>
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
- <transport arch="32+64">passthrough</transport>
+ <transport arch="32">passthrough</transport>
<impl level="generic"></impl>
<version>2.0</version>
<interface>
@@ -30,7 +30,7 @@
</hal>
<hal format="hidl">
<name>android.hardware.tv.cec</name>
- <transport>hwbinder</transport>
+ <transport arch="32">passthrough</transport>
<version>1.0</version>
<interface>
<name>IHdmiCec</name>
@@ -39,7 +39,7 @@
</hal>
<hal format="hidl">
<name>android.hardware.tv.input</name>
- <transport>hwbinder</transport>
+ <transport arch="32">passthrough</transport>
<version>1.0</version>
<interface>
<name>ITvInput</name>
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index f71d5f1..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright 2013 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.
-#
-
-add_lunch_combo full_fugu-userdebug
-add_lunch_combo aosp_fugu-userdebug