Merge "Use jarjar rules for framework.jar." am: b70a6cbf9a
am: 4382755210
Change-Id: Ib36a2c578ce37876dd1c544f471987b9a32bdc5a
This commit is contained in:
@@ -681,7 +681,7 @@ java_defaults {
|
|||||||
"ext",
|
"ext",
|
||||||
],
|
],
|
||||||
|
|
||||||
jarjar_rules: "jarjar_rules_hidl.txt",
|
jarjar_rules: ":framework-jarjar-rules",
|
||||||
|
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"apex_aidl_interface-java",
|
"apex_aidl_interface-java",
|
||||||
@@ -726,6 +726,11 @@ java_defaults {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filegroup {
|
||||||
|
name: "framework-jarjar-rules",
|
||||||
|
srcs: ["jarjar_rules_hidl.txt"],
|
||||||
|
}
|
||||||
|
|
||||||
filegroup {
|
filegroup {
|
||||||
name: "libincident_aidl",
|
name: "libincident_aidl",
|
||||||
srcs: [
|
srcs: [
|
||||||
|
|||||||
Reference in New Issue
Block a user