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

Commit de07ab06 authored by Hassan Ali's avatar Hassan Ali Committed by Automerger Merge Worker
Browse files

Merge "Add CtsShimAddApkToApex app" into main am: c947eb92 am: f7fa7a34... 

Merge "Add CtsShimAddApkToApex app" into main am: c947eb92 am: f7fa7a34 am: 6caa7cbb am: 709104ff

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2715533



Change-Id: I1a5a9bcf3c823515c17ebad5d8729723fcabc3e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f8f9125 709104ff

packages/CtsShim/build/Android.bp

+19 −0
Original line number Diff line number Diff line
@@ -208,3 +208,22 @@ android_app { 
    ],

    min_sdk_version: "24",

}



//##########################################################

// Variant: Add apk to an apex

android_app {

    name: "CtsShimAddApkToApex",

    sdk_version: "current",

    srcs: ["shim_add_apk_to_apex/src/android/addapktoapex/app/AddApkToApexDeviceActivity.java"],

    optimize: {

        enabled: false,

    },

    dex_preopt: {

        enabled: false,

    },

    manifest: "shim_add_apk_to_apex/AndroidManifestAddApkToApex.xml",

    apex_available: [

        "//apex_available:platform",

        "com.android.apex.cts.shim.v2_add_apk_to_apex",

    ],

}

packages/CtsShim/build/shim_add_apk_to_apex/AndroidManifestAddApkToApex.xml

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

<!--

 * Copyright (C) 2023 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="android.addapktoapex.app">



    <application>

        <activity android:name=".AddApkToApexDeviceActivity"

             android:exported="true">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

    </application>



</manifest>
 
 No newline at end of file

packages/CtsShim/build/shim_add_apk_to_apex/src/android/addapktoapex/app/AddApkToApexDeviceActivity.java

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.

 */



package android.addapktoapex.app;



import android.app.Activity;

import android.os.Bundle;

import android.util.Log;



/**

 * A simple activity which logs to Logcat.

 */

public class AddApkToApexDeviceActivity extends Activity {



    private static final String TAG = AddApkToApexDeviceActivity.class.getSimpleName();



    /**

     * The test string to log.

     */

    private static final String TEST_STRING = "AddApkToApexTestString";



    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        // Log the test string to Logcat.

        Log.i(TAG, TEST_STRING);

    }



}