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

Commit a0770f74 authored May 23, 2023 by Treehugger Robot Committed by Android (Google) Code Review May 23, 2023

Merge "Change libidmap2_policies to static"

parents 1a2ab4f8 39fe2cc1

cmds/idmap2/Android.bp

+9 −8

Original line number	Diff line number	Diff line
		@@ -84,13 +84,13 @@ cc_library {
		enabled: false,
		},
		static_libs: [
		"libidmap2_policies",
		"libidmap2_protos",
		],
		shared_libs: [
		"libandroidfw",
		"libbase",
		"libcutils",
		"libidmap2_policies",
		"libprotobuf-cpp-lite",
		"libutils",
		"libz",
		@@ -129,7 +129,7 @@ cc_library {
		},
		}

		cc_library {
		cc_library_static {
		name: "libidmap2_policies",
		defaults: [
		"idmap2_defaults",
		@@ -146,9 +146,6 @@ cc_library {
		],
		},
		host: {
		shared: {
		enabled: false,
		},
		static_libs: [
		"libandroidfw",
		],
		@@ -195,7 +192,6 @@ cc_test {
		"libandroidfw",
		"libbase",
		"libidmap2",
		"libidmap2_policies",
		"liblog",
		"libprotobuf-cpp-lite",
		"libutils",
		@@ -203,6 +199,9 @@ cc_test {
		"libz",
		"libziparchive",
		],
		static_libs: [
		"libidmap2_policies",
		],
		},
		host: {
		static_libs: [
		@@ -259,12 +258,14 @@ cc_binary {
		"libbase",
		"libcutils",
		"libidmap2",
		"libidmap2_policies",
		"libprotobuf-cpp-lite",
		"libutils",
		"libz",
		"libziparchive",
		],
		static_libs: [
		"libidmap2_policies",
		],
		},
		host: {
		static_libs: [
		@@ -302,13 +303,13 @@ cc_binary {
		"libbinder",
		"libcutils",
		"libidmap2",
		"libidmap2_policies",
		"libprotobuf-cpp-lite",
		"libutils",
		"libziparchive",
		],
		static_libs: [
		"libc++fs",
		"libidmap2_policies",
		"libidmap2_protos",
		"libidmap2daidl",
		],