summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-03-22 15:53:57 -0700
committerJean-Baptiste Queru <jbq@google.com>2013-03-25 15:02:28 -0700
commita99064d9937908a6174399855fdde55a99a4cf3c (patch)
tree8c80b011c8220ff769c847670cbb489bf1487095
parentf827431994e4f87da08e2e1566e2267d0a18172a (diff)
downloadtuna-a99064d9937908a6174399855fdde55a99a4cf3c.tar.gz
Rename AOSP builds to aosp_*
Change-Id: I6acb7acc2e5220603dd692888a8ce1f145119944
-rw-r--r--AndroidProducts.mk1
-rw-r--r--aosp_tuna.mk18
-rw-r--r--full_tuna.mk4
3 files changed, 21 insertions, 2 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 5137bf4..dff8b42 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,5 @@
#
PRODUCT_MAKEFILES := \
+ $(LOCAL_DIR)/aosp_tuna.mk \
$(LOCAL_DIR)/full_tuna.mk
diff --git a/aosp_tuna.mk b/aosp_tuna.mk
new file mode 100644
index 0000000..e566d02
--- /dev/null
+++ b/aosp_tuna.mk
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+$(call inherit-product, device/samsung/tuna/full_tuna.mk)
+
+PRODUCT_NAME := aosp_tuna
diff --git a/full_tuna.mk b/full_tuna.mk
index 0e4aa5b..b1b1622 100644
--- a/full_tuna.mk
+++ b/full_tuna.mk
@@ -22,7 +22,7 @@
#
# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
# This is where we'd set a backup provider if we had one
#$(call inherit-product, device/sample/products/backup_overlay.mk)
# Inherit from tuna device
@@ -32,4 +32,4 @@ $(call inherit-product, device/samsung/tuna/device.mk)
PRODUCT_NAME := full_tuna
PRODUCT_DEVICE := tuna
PRODUCT_BRAND := Android
-PRODUCT_MODEL := Full AOSP on Tuna
+PRODUCT_MODEL := AOSP on Tuna