From bb955f4d547c95e80f55f1d082b1bf56e62c8831 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 22 Mar 2013 15:53:57 -0700 Subject: Rename AOSP builds to aosp_* Change-Id: I5c12171e585dfc11561a8d639d0d8e2463531deb --- AndroidProducts.mk | 1 + aosp_maguro.mk | 18 ++++++++++++++++++ full_maguro.mk | 4 ++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 aosp_maguro.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 90f9412..faaec68 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,4 +15,5 @@ # PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/aosp_maguro.mk \ $(LOCAL_DIR)/full_maguro.mk diff --git a/aosp_maguro.mk b/aosp_maguro.mk new file mode 100644 index 0000000..fc1140b --- /dev/null +++ b/aosp_maguro.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/maguro/full_maguro.mk) + +PRODUCT_NAME := aosp_maguro diff --git a/full_maguro.mk b/full_maguro.mk index f0614d8..810642e 100644 --- a/full_maguro.mk +++ b/full_maguro.mk @@ -25,7 +25,7 @@ PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml # Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.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 maguro device @@ -35,5 +35,5 @@ $(call inherit-product, device/samsung/maguro/device.mk) PRODUCT_NAME := full_maguro PRODUCT_DEVICE := maguro PRODUCT_BRAND := Android -PRODUCT_MODEL := Full AOSP on Maguro +PRODUCT_MODEL := AOSP on Maguro PRODUCT_RESTRICT_VENDOR_FILES := true -- cgit v1.1