Merge remote-tracking branch 'origin/lineage-23.0' into a16 (1a9dd49e) · Commits · e / os / android_packages_apps_Twelve

app/Android.bp

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -60,8 +60,10 @@ android_app {
	"Twelve_androidx.media3_media3-exoplayer-smoothstreaming",		"Twelve_androidx.media3_media3-exoplayer-smoothstreaming",
	"Twelve_androidx.media3_media3-session",		"Twelve_androidx.media3_media3-session",
	"Twelve_androidx.media3_media3-ui",		"Twelve_androidx.media3_media3-ui",
	"androidx.navigation_navigation-fragment-ktx",		"Twelve_androidx.navigation_navigation-common-android",
	"androidx.navigation_navigation-ui-ktx",		"Twelve_androidx.navigation_navigation-fragment-ktx",
			"Twelve_androidx.navigation_navigation-runtime-android",
			"Twelve_androidx.navigation_navigation-ui-ktx",
	"androidx.preference_preference",		"androidx.preference_preference",
	"androidx.recyclerview_recyclerview",		"androidx.recyclerview_recyclerview",
	"androidx.room_room-ktx",		"androidx.room_room-ktx",

app/build.gradle.kts

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -104,8 +104,9 @@ configure<GenerateBpPluginExtension> {
	availableInAOSP.set { module: Module ->		availableInAOSP.set { module: Module ->
	when {		when {
	module.group.startsWith("androidx") -> {		module.group.startsWith("androidx") -> {
	// We provide our own androidx.media3		// We provide our own androidx.media3 and androidx.navigation
	!module.group.startsWith("androidx.media3")		!module.group.startsWith("androidx.media3") &&
			!module.group.startsWith("androidx.navigation")
	}		}
	module.group.startsWith("org.jetbrains") -> true		module.group.startsWith("org.jetbrains") -> true
	module.group == "com.google.android.material" -> true		module.group == "com.google.android.material" -> true

app/libs/Android.bp

+152 −0

Original line number	Original line	Diff line number	Diff line
	@@ -239,6 +239,158 @@ android_library_import {
	],		],
	}		}

			java_library_static {
			name: "Twelve_androidx.navigation_navigation-common",
			sdk_version: "36",
			min_sdk_version: "30",
			apex_available: [
			"//apex_available:platform",
			"//apex_available:anyapex",
			],
			static_libs: [
			"Twelve_androidx.navigation_navigation-common-android",
			],
			}

			android_library_import {
			name: "Twelve_androidx.navigation_navigation-common-android",
			aars: ["androidx/navigation/navigation-common-android/2.9.5/navigation-common-release.aar"],
			sdk_version: "36",
			min_sdk_version: "30",
			apex_available: [
			"//apex_available:platform",
			"//apex_available:anyapex",
			],
			static_libs: [
			"androidx.annotation_annotation",
			"androidx.collection_collection",
			"androidx.core_core-ktx",
			"androidx.lifecycle_lifecycle-common",
			"androidx.lifecycle_lifecycle-runtime",
			"androidx.lifecycle_lifecycle-viewmodel",
			"androidx.lifecycle_lifecycle-viewmodel-savedstate",
			"androidx.profileinstaller_profileinstaller",
			"androidx.savedstate_savedstate",
			"kotlin-stdlib",
			"kotlinx_serialization_core",
			],
			}

			android_library_import {
			name: "Twelve_androidx.navigation_navigation-fragment",
			aars: ["androidx/navigation/navigation-fragment/2.9.5/navigation-fragment-2.9.5.aar"],
			sdk_version: "36",
			min_sdk_version: "30",
			apex_available: [
			"//apex_available:platform",
			"//apex_available:anyapex",
			],
			static_libs: [
			"androidx.activity_activity",
			"androidx.core_core-ktx",
			"androidx.fragment_fragment-ktx",
			"androidx.lifecycle_lifecycle-common",
			"androidx.lifecycle_lifecycle-livedata-core",
			"androidx.lifecycle_lifecycle-viewmodel",
			"Twelve_androidx.navigation_navigation-common",
			"Twelve_androidx.navigation_navigation-runtime",
			"androidx.savedstate_savedstate",
			"androidx.slidingpanelayout_slidingpanelayout",
			"kotlin-stdlib",
			"kotlinx-coroutines-core",
			"kotlinx_serialization_core",
			],
			}

			android_library_import {
			name: "Twelve_androidx.navigation_navigation-fragment-ktx",
			aars: ["androidx/navigation/navigation-fragment-ktx/2.9.5/navigation-fragment-ktx-2.9.5.aar"],
			sdk_version: "36",
			min_sdk_version: "30",
			apex_available: [
			"//apex_available:platform",
			"//apex_available:anyapex",
			],
			static_libs: [
			"Twelve_androidx.navigation_navigation-fragment",
			],
			}

			java_library_static {
			name: "Twelve_androidx.navigation_navigation-runtime",
			sdk_version: "36",
			min_sdk_version: "30",
			apex_available: [
			"//apex_available:platform",
			"//apex_available:anyapex",
			],
			static_libs: [
			"Twelve_androidx.navigation_navigation-runtime-android",
			],
			}

			android_library_import {
			name: "Twelve_androidx.navigation_navigation-runtime-android",
			aars: ["androidx/navigation/navigation-runtime-android/2.9.5/navigation-runtime-release.aar"],
			sdk_version: "36",
			min_sdk_version: "30",
			apex_available: [
			"//apex_available:platform",
			"//apex_available:anyapex",
			],
			static_libs: [
			"androidx.activity_activity-ktx",
			"androidx.annotation_annotation-experimental",
			"androidx.collection_collection",
			"androidx.core_core-ktx",
			"androidx.lifecycle_lifecycle-common",
			"androidx.lifecycle_lifecycle-runtime",
			"androidx.lifecycle_lifecycle-runtime-ktx",
			"androidx.lifecycle_lifecycle-viewmodel",
			"androidx.lifecycle_lifecycle-viewmodel-ktx",
			"Twelve_androidx.navigation_navigation-common",
			"kotlin-stdlib",
			"kotlinx-coroutines-core",
			"kotlinx_serialization_core",
			],
			}

			android_library_import {
			name: "Twelve_androidx.navigation_navigation-ui",
			aars: ["androidx/navigation/navigation-ui/2.9.5/navigation-ui-2.9.5.aar"],
			sdk_version: "36",
			min_sdk_version: "30",
			apex_available: [
			"//apex_available:platform",
			"//apex_available:anyapex",
			],
			static_libs: [
			"androidx.appcompat_appcompat",
			"androidx.coordinatorlayout_coordinatorlayout",
			"androidx.core_core-ktx",
			"androidx.customview_customview",
			"androidx.drawerlayout_drawerlayout",
			"Twelve_androidx.navigation_navigation-common",
			"Twelve_androidx.navigation_navigation-runtime",
			"androidx.transition_transition",
			"com.google.android.material_material",
			],
			}

			android_library_import {
			name: "Twelve_androidx.navigation_navigation-ui-ktx",
			aars: ["androidx/navigation/navigation-ui-ktx/2.9.5/navigation-ui-ktx-2.9.5.aar"],
			sdk_version: "36",
			min_sdk_version: "30",
			apex_available: [
			"//apex_available:platform",
			"//apex_available:anyapex",
			],
			static_libs: [
			"Twelve_androidx.navigation_navigation-ui",
			],
			}

	android_library_import {		android_library_import {
	name: "Twelve_com.github.bogerchan_Nier-Visualizer",		name: "Twelve_com.github.bogerchan_Nier-Visualizer",
	aars: ["com/github/bogerchan/Nier-Visualizer/v0.1.3/Nier-Visualizer-v0.1.3.aar"],		aars: ["com/github/bogerchan/Nier-Visualizer/v0.1.3/Nier-Visualizer-v0.1.3.aar"],

app/libs/androidx/navigation/navigation-common-android/2.9.5/navigation-common-release.aar

0 → 100644

+359 KiB

File added.

No diff preview for this file type.

View file

app/libs/androidx/navigation/navigation-common-android/2.9.5/navigation-common-release.aar.license

0 → 100644

+3 −0

Original line number	Original line	Diff line number	Diff line
			SPDX-FileCopyrightText: 2017 The Android Open Source Project

			SPDX-License-Identifier: Apache-2.0