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

Commit d619e432 authored by Makoto Onuki's avatar Makoto Onuki Committed by John Wu
Browse files

[Ravenwood] Add framework-res.apk to ravenwood-runtime 

Also add a test for android_ravenwood_test.resource_apk.

Bug: 339614874
Test: atest RavenwoodResApkTest
Flag: EXEMPT: Host side change only

Change-Id: I66558323f5313546876254f1635fa5260e1790e4
(cherry picked from commit e49a7722)
parent f01b5029

ravenwood/Android.bp

+7 −1
Original line number Diff line number Diff line
@@ -68,7 +68,10 @@ java_library { 
    srcs: [

        "runtime-common-ravenwood-src/**/*.java",

    ],

    visibility: ["//frameworks/base"],

    visibility: [

        // Some tests need to access the utilities.

        ":__subpackages__",

    ],

}



java_library {
@@ -318,6 +321,9 @@ java_library { 


android_ravenwood_libgroup {

    name: "ravenwood-runtime",

    data: [

        "framework-res",

    ],

    libs: [

        "100-framework-minus-apex.ravenwood",

        "200-kxml2-android",

ravenwood/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
    {

      "name": "RavenwoodBivalentTest_device"

    },

    {

      "name": "RavenwoodResApkTest"

    },

    // The sysui tests should match vendor/unbundled_google/packages/SystemUIGoogle/TEST_MAPPING

    {

      "name": "SystemUIGoogleTests",

ravenwood/resapk_test/Android.bp

0 → 100644
+30 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



android_ravenwood_test {

    name: "RavenwoodResApkTest",



    resource_apk: "RavenwoodResApkTest-apk",



    libs: [

        // Normally, tests shouldn't directly access it, but we need to access RavenwoodCommonUtils

        // in this test.

        "ravenwood-runtime-common-ravenwood",

    ],

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.test.ext.junit",

        "androidx.test.rules",

    ],

    srcs: [

        "test/**/*.java",

    ],

    sdk_version: "test_current",

    auto_gen_config: true,

}

ravenwood/resapk_test/apk/Android.bp

0 → 100644
+14 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



android_app {

    name: "RavenwoodResApkTest-apk",



    sdk_version: "current",

}

ravenwood/resapk_test/apk/AndroidManifest.xml

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

<!-- Copyright (C) 2024 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.ravenwood.restest_apk">

</manifest>