Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fd93187 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Steve Kondik
Browse files

Squished commit of full config cleanup 

Truly default to the full config.

It is much better than generic for emulator-based work.

AOSP-Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d

Make a full list of locales available

Use it for the sim build and full build.

AOSP-Change-Id: I64dfa7ac1b374529ef5f0c1460dd35171311115e

Fix list of locales (bad country codes).

DA->DK, SV->SE

AOSP-Change-Id: I7bc7f64905ecd583e1a7ca5b43a8fffd5f3ba383

Switch Unbundled apps from generic.mk to full.mk.

AOSP-Change-Id: I7aaaef8f2032590d55ccec77621c6b3f4c121f9a

Clean up full config - DO NOT MERGE

This splits the existing full.mk in two parts:

-One is the device-independent full_base.mk
-The other is the emulator-specific device.mk

This way we'll be able to inherit from full_base.mk
for on-device builds without any emulator-specific
files getting in the way.

AOSP-Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d

Minor cleanup - DO NOT MERGE

AOSP-Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22

Add full-eng instead of generic-eng in the lunch menu

Change-Id: I18c89da732c8c36ad32de7116248ae6562e050cb
AOSP-Change-Id: I3f779087021ef3674ee9ceb8cc3b15f83a98b8f4
parent 3a990cda

core/envsetup.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ ifeq ($(TARGET_PRODUCT),) 
ifeq ($(TARGET_SIMULATOR),true)

TARGET_PRODUCT := sim

else

TARGET_PRODUCT := generic

TARGET_PRODUCT := full

endif

endif

envsetup.sh

+5 −5
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ function chooseproduct() 
        if [ "$TARGET_SIMULATOR" = true ] ; then

            default_value=sim

        else

            default_value=generic

            default_value=full

        fi

    fi
@@ -431,7 +431,7 @@ function add_lunch_combo() 
}



# add the default one here

add_lunch_combo generic-eng

add_lunch_combo full-eng



# if we're on linux, add the simulator.  There is a special case

# in lunch to deal with the simulator
@@ -466,7 +466,7 @@ function lunch() 
        answer=$1

    else

        print_lunch_menu

        echo -n "Which would you like? [generic-eng] "

        echo -n "Which would you like? [full-eng] "

        read answer

    fi
@@ -474,7 +474,7 @@ function lunch() 


    if [ -z "$answer" ]

    then

        selection=generic-eng

        selection=full-eng

    elif [ "$answer" = "simulator" ]

    then

        selection=simulator
@@ -562,7 +562,7 @@ function tapas() 
        apps=all

    fi



    export TARGET_PRODUCT=generic

    export TARGET_PRODUCT=full

    export TARGET_BUILD_VARIANT=$variant

    export TARGET_SIMULATOR=false

    export TARGET_BUILD_TYPE=release

target/board/generic/device.mk

0 → 100644
+26 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2009 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.

#



# This is a build configuration for the product aspects that

# are specific to the emulator.



PRODUCT_PROPERTY_OVERRIDES := \

    ro.ril.hsxpa=1 \

    ro.ril.gprsclass=10



PRODUCT_COPY_FILES := \

    development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

    development/data/etc/vold.conf:system/etc/vold.conf

target/product/AndroidProducts.mk

+3 −2
Original line number Diff line number Diff line
@@ -25,11 +25,12 @@ 
# it includes.

#



# An unbundled app build needs only generic.mk.

# Unbundled apps will be built with the default product config.

ifneq ($(TARGET_BUILD_APPS),)

PRODUCT_MAKEFILES := \

    $(LOCAL_DIR)/core.mk \

    $(LOCAL_DIR)/generic.mk

    $(LOCAL_DIR)/generic.mk \

    $(LOCAL_DIR)/full.mk

else

PRODUCT_MAKEFILES := \

    $(LOCAL_DIR)/core.mk \

target/product/full.mk

+6 −36
Original line number Diff line number Diff line
@@ -16,44 +16,14 @@ 


# This is a build configuration for a full-featured build of the

# Open-Source part of the tree. It's geared toward a US-centric

# build of the emulator, but all those aspects can be overridden

# in inherited configurations.

# build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



PRODUCT_PACKAGES := \

    OpenWnn \

    PinyinIME \

    VoiceDialer \

    libWnnEngDic \

    libWnnJpnDic \

    libwnndict



# Additional settings used in all AOSP builds

PRODUCT_PROPERTY_OVERRIDES := \

    keyguard.no_require_sim=true \

    ro.com.android.dateformat=MM-dd-yyyy \

    ro.com.android.dataroaming=true \

    ro.ril.hsxpa=1 \

    ro.ril.gprsclass=10



PRODUCT_COPY_FILES := \

    development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

    development/data/etc/vold.conf:system/etc/vold.conf



# Pick up some sounds - stick with the short list to save space

# on smaller devices.

$(call inherit-product, frameworks/base/data/sounds/OriginalAudio.mk)



# Get the TTS language packs

$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)



# Get a list of languages. We use the small list to save space

# on smaller devices.

$(call inherit-product, build/target/product/languages_small.mk)



$(call inherit-product, build/target/product/generic.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)



# Overrides

PRODUCT_NAME := full

PRODUCT_BRAND := generic

PRODUCT_DEVICE := generic

PRODUCT_MODEL := Full Android
 
PRODUCT_BRAND := Android

PRODUCT_MODEL := Full Android on Emulator