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

Commit f0009776 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Add support for building split APKs"

parents 1cb088c1 fab50875

libs/androidfw/ResourceTypes.cpp

+49 −42
Original line number Diff line number Diff line
@@ -2452,15 +2452,19 @@ String8 ResTable_config::toString() const { 


    if (mcc != 0) {

        if (res.size() > 0) res.append("-");

        res.appendFormat("%dmcc", dtohs(mcc));

        res.appendFormat("mcc%d", dtohs(mcc));

    }

    if (mnc != 0) {

        if (res.size() > 0) res.append("-");

        res.appendFormat("%dmnc", dtohs(mnc));

        res.appendFormat("mnc%d", dtohs(mnc));

    }



    char localeStr[RESTABLE_MAX_LOCALE_LEN];

    getBcp47Locale(localeStr);

    if (strlen(localeStr) > 0) {

        if (res.size() > 0) res.append("-");

        res.append(localeStr);

    }



    if ((screenLayout&MASK_LAYOUTDIR) != 0) {

        if (res.size() > 0) res.append("-");
@@ -2627,6 +2631,20 @@ String8 ResTable_config::toString() const { 
                break;

        }

    }

    if ((inputFlags&MASK_KEYSHIDDEN) != 0) {

        if (res.size() > 0) res.append("-");

        switch (inputFlags&MASK_KEYSHIDDEN) {

            case ResTable_config::KEYSHIDDEN_NO:

                res.append("keysexposed");

                break;

            case ResTable_config::KEYSHIDDEN_YES:

                res.append("keyshidden");

                break;

            case ResTable_config::KEYSHIDDEN_SOFT:

                res.append("keyssoft");

                break;

        }

    }

    if (keyboard != KEYBOARD_ANY) {

        if (res.size() > 0) res.append("-");

        switch (keyboard) {
@@ -2644,17 +2662,18 @@ String8 ResTable_config::toString() const { 
                break;

        }

    }

    if ((inputFlags&MASK_KEYSHIDDEN) != 0) {

    if ((inputFlags&MASK_NAVHIDDEN) != 0) {

        if (res.size() > 0) res.append("-");

        switch (inputFlags&MASK_KEYSHIDDEN) {

            case ResTable_config::KEYSHIDDEN_NO:

                res.append("keysexposed");

        switch (inputFlags&MASK_NAVHIDDEN) {

            case ResTable_config::NAVHIDDEN_NO:

                res.append("navexposed");

                break;

            case ResTable_config::KEYSHIDDEN_YES:

                res.append("keyshidden");

            case ResTable_config::NAVHIDDEN_YES:

                res.append("navhidden");

                break;

            case ResTable_config::KEYSHIDDEN_SOFT:

                res.append("keyssoft");

            default:

                res.appendFormat("inputFlagsNavHidden=%d",

                        dtohs(inputFlags&MASK_NAVHIDDEN));

                break;

        }

    }
@@ -2678,21 +2697,6 @@ String8 ResTable_config::toString() const { 
                break;

        }

    }

    if ((inputFlags&MASK_NAVHIDDEN) != 0) {

        if (res.size() > 0) res.append("-");

        switch (inputFlags&MASK_NAVHIDDEN) {

            case ResTable_config::NAVHIDDEN_NO:

                res.append("navsexposed");

                break;

            case ResTable_config::NAVHIDDEN_YES:

                res.append("navhidden");

                break;

            default:

                res.appendFormat("inputFlagsNavHidden=%d",

                        dtohs(inputFlags&MASK_NAVHIDDEN));

                break;

        }

    }

    if (screenSize != 0) {

        if (res.size() > 0) res.append("-");

        res.appendFormat("%dx%d", dtohs(screenWidth), dtohs(screenHeight));
@@ -5504,6 +5508,24 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg, 
            return (mError=NO_MEMORY);

        }



        if (idmap_id == 0) {

            err = package->typeStrings.setTo(base+dtohl(pkg->typeStrings),

                                           header->dataEnd-(base+dtohl(pkg->typeStrings)));

            if (err != NO_ERROR) {

                delete group;

                delete package;

                return (mError=err);

            }



            err = package->keyStrings.setTo(base+dtohl(pkg->keyStrings),

                                          header->dataEnd-(base+dtohl(pkg->keyStrings)));

            if (err != NO_ERROR) {

                delete group;

                delete package;

                return (mError=err);

            }

        }



        if (id == 0) {

            // This is a library so assign an ID

            id = mNextPackageId++;
@@ -5521,21 +5543,6 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg, 
                return (mError=NO_MEMORY);

            }



            err = package->typeStrings.setTo(base+dtohl(pkg->typeStrings),

                                           header->dataEnd-(base+dtohl(pkg->typeStrings)));

            if (err != NO_ERROR) {

                delete group;

                delete package;

                return (mError=err);

            }

            err = package->keyStrings.setTo(base+dtohl(pkg->keyStrings),

                                          header->dataEnd-(base+dtohl(pkg->keyStrings)));

            if (err != NO_ERROR) {

                delete group;

                delete package;

                return (mError=err);

            }



            //printf("Adding new package id %d at index %d\n", id, idx);

            err = mPackageGroups.add(group);

            if (err < NO_ERROR) {

tests/Split/Android.mk

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

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

#



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_PACKAGE_NAME := Split



LOCAL_AAPT_FLAGS := --split fr,de

LOCAL_AAPT_FLAGS += -v



LOCAL_MODULE_TAGS := tests



include $(BUILD_PACKAGE)

tests/Split/AndroidManifest.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.example.split">

    <application android:label="@string/app_title">

        <activity android:name="ActivityMain">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

    </application>

</manifest>

tests/Split/assets/blah.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
This is some useful info.

tests/Split/assets/statement.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.

-->



<statement>

    <value>Hello</value>

</statement>