Merge remote-tracking branch 'origin/lineage-21.0' into v1-u (17708842) · Commits · e / os / android_packages_apps_Recorder

app/Android.bp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,14 +21,15 @@ android_app {
	// DO NOT EDIT THIS SECTION MANUALLY		// DO NOT EDIT THIS SECTION MANUALLY
	"androidx.activity_activity-ktx",		"androidx.activity_activity-ktx",
	"androidx.appcompat_appcompat",		"androidx.appcompat_appcompat",
	"androidx.core_core-ktx",
	"Recorder_com.google.android.material_material",
	"androidx-constraintlayout_constraintlayout",		"androidx-constraintlayout_constraintlayout",
			"androidx.core_core-ktx",
	"androidx.lifecycle_lifecycle-livedata-ktx",		"androidx.lifecycle_lifecycle-livedata-ktx",
	"androidx.lifecycle_lifecycle-service",		"androidx.lifecycle_lifecycle-service",
	"androidx.lifecycle_lifecycle-viewmodel-ktx",		"androidx.lifecycle_lifecycle-viewmodel-ktx",
	"androidx.recyclerview_recyclerview",		"androidx.recyclerview_recyclerview",
	"androidx.recyclerview_recyclerview-selection",		"androidx.recyclerview_recyclerview-selection",
			"Recorder_com.google.android.material_material",
			"kotlin-stdlib-jdk8",
	"elib",		"elib",
	],		],

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@ apply {

	buildscript {		buildscript {
	repositories {		repositories {
	maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.6/.m2")		maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.17/.m2")
	}		}

	dependencies {		dependencies {
	@@ -89,6 +89,7 @@ dependencies {

	configure<GenerateBpPluginExtension> {		configure<GenerateBpPluginExtension> {
	targetSdk.set(android.defaultConfig.targetSdk!!)		targetSdk.set(android.defaultConfig.targetSdk!!)
			minSdk.set(android.defaultConfig.minSdk!!)
	availableInAOSP.set { module: Module ->		availableInAOSP.set { module: Module ->
	when {		when {
	module.group.startsWith("androidx") -> true		module.group.startsWith("androidx") -> true

+3 −4

Original line number	Original line	Diff line number	Diff line
	//		//
	// SPDX-FileCopyrightText: 2024 The LineageOS Project		// SPDX-FileCopyrightText: The LineageOS Project
	// SPDX-License-Identifier: Apache-2.0		// SPDX-License-Identifier: Apache-2.0
	//		//

	@@ -9,7 +9,7 @@ android_library_import {
	name: "Recorder_com.google.android.material_material-nodeps",		name: "Recorder_com.google.android.material_material-nodeps",
	aars: ["com/google/android/material/material/1.9.0/material-1.9.0.aar"],		aars: ["com/google/android/material/material/1.9.0/material-1.9.0.aar"],
	sdk_version: "34",		sdk_version: "34",
	min_sdk_version: "14",		min_sdk_version: "29",
	apex_available: [		apex_available: [
	"//apex_available:platform",		"//apex_available:platform",
	"//apex_available:anyapex",		"//apex_available:anyapex",
	@@ -37,7 +37,7 @@ android_library_import {
	android_library {		android_library {
	name: "Recorder_com.google.android.material_material",		name: "Recorder_com.google.android.material_material",
	sdk_version: "34",		sdk_version: "34",
	min_sdk_version: "14",		min_sdk_version: "29",
	apex_available: [		apex_available: [
	"//apex_available:platform",		"//apex_available:platform",
	"//apex_available:anyapex",		"//apex_available:anyapex",
	@@ -62,5 +62,4 @@ android_library {
	"androidx.viewpager2_viewpager2",		"androidx.viewpager2_viewpager2",
	"error_prone_annotations",		"error_prone_annotations",
	],		],
	java_version: "1.7",
	}		}

+1 −1

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

	SPDX-License-Identifier: Apache-2.0		SPDX-License-Identifier: Apache-2.0

+1 −1

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

	SPDX-License-Identifier: Apache-2.0		SPDX-License-Identifier: Apache-2.0