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

Commit 88f66ad0 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Update namespace for Preference testutils" into main

parents 4e8638c6 fb86d9dd

packages/SettingsLib/Preference/Android.bp

+16 −13
Original line number Original line Diff line number Diff line 
//

// 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.

//



package {

package {

    default_applicable_licenses: ["frameworks_base_license"],

    default_applicable_licenses: ["frameworks_base_license"],

}

}
@@ -22,16 +38,3 @@ android_library { 
    ],

    ],

    kotlincflags: ["-Xjvm-default=all"],

    kotlincflags: ["-Xjvm-default=all"],

}
 
}
 


android_library {

    name: "SettingsLibPreference-testutils",

    srcs: ["testutils/**/*.kt"],

    static_libs: [

        "SettingsLibPreference",

        "androidx.fragment_fragment-testing",

        "androidx.test.core",

        "androidx.test.ext.junit",

        "flag-junit",

        "truth",

    ],

}

packages/SettingsLib/Preference/testutils/Android.bp

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
//

// 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.

//



package {

    default_applicable_licenses: ["frameworks_base_license"],

}



android_library {

    name: "SettingsLibPreference-testutils",

    srcs: ["**/*.kt"],

    static_libs: [

        "SettingsLibPreference",

        "androidx.fragment_fragment-testing",

        "androidx.test.core",

        "androidx.test.ext.junit",

        "flag-junit",

        "truth",

    ],

}

packages/SettingsLib/Preference/testutils/AndroidManifest.xml

0 → 100644
+21 −0
Original line number Original line 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.settingslib.preference.testutils">



  <uses-sdk android:minSdkVersion="21" />

</manifest>