diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-26 14:13:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-26 14:13:10 -0700 |
| commit | e09cbad189fa5365188eaa21b3c9167dd55708ab (patch) | |
| tree | 6e4c7fcdc31371ef36109e0e69aae37e3aca6168 | |
| parent | e053d3f89bbbcd250deab8923742fe1896c336b6 (diff) | |
| parent | d8f789c576d8a6ffe44fdad6056f471210e8a32a (diff) | |
| download | toroplus-e09cbad189fa5365188eaa21b3c9167dd55708ab.tar.gz | |
am d8f789c5: Rename AOSP builds to aosp_*
* commit 'd8f789c576d8a6ffe44fdad6056f471210e8a32a':
Rename AOSP builds to aosp_*
| -rw-r--r-- | AndroidProducts.mk | 1 | ||||
| -rw-r--r-- | aosp_toroplus.mk | 18 | ||||
| -rw-r--r-- | full_toroplus.mk | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 543e54d..f6c29c8 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,4 +15,5 @@ # PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/aosp_toroplus.mk \ $(LOCAL_DIR)/full_toroplus.mk diff --git a/aosp_toroplus.mk b/aosp_toroplus.mk new file mode 100644 index 0000000..b48b0eb --- /dev/null +++ b/aosp_toroplus.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/toroplus/full_toroplus.mk) + +PRODUCT_NAME := aosp_toroplus diff --git a/full_toroplus.mk b/full_toroplus.mk index cb491f7..d2124ad 100644 --- a/full_toroplus.mk +++ b/full_toroplus.mk @@ -25,7 +25,7 @@ PRODUCT_COPY_FILES := device/samsung/toroplus/test-apns-conf_sprint.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/toroplus/device.mk) PRODUCT_NAME := full_toroplus PRODUCT_DEVICE := toroplus PRODUCT_BRAND := Android -PRODUCT_MODEL := Full AOSP on Toroplus +PRODUCT_MODEL := AOSP on Toroplus PRODUCT_RESTRICT_VENDOR_FILES := true |