Skip to content

Commit 289a482

Browse files
committed
Use java_sdk_library for API for updatable-media
The API for the updatable-media library is prefixed with framework-media so it cannot be switched to use java_sdk_library directly. Instead a new API only java_sdk_library was added for framework-media. The names of the individual modules do not quite follow the pattern that java_sdk_library uses so this temporarily sets the following: naming_scheme: "frameworks-modules" That causes java_sdk_library to use a naming scheme that matches the one used by the individual modules of this. It will be cleaned up later. Test: m update-api Bug: 155164730 Change-Id: Ib9dd6d276856146e161578697cc6ba83b26e4ad8
1 parent efbfbe0 commit 289a482

1 file changed

Lines changed: 15 additions & 82 deletions

File tree

apex/media/framework/Android.bp

Lines changed: 15 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -83,98 +83,31 @@ filegroup {
8383
"java/android/media/MediaParser.java"
8484
],
8585
path: "java",
86-
}
86+
}
8787

88-
stubs_defaults {
89-
name: "framework-media-stubs-srcs-defaults",
90-
srcs: [ ":updatable-media-srcs" ],
91-
libs: [ "framework_media_annotation" ],
92-
aidl: {
93-
// TODO(b/135922046) remove this
94-
include_dirs: ["frameworks/base/core/java"],
95-
},
96-
dist: { dest: "framework-media.txt" },
97-
}
88+
java_sdk_library {
89+
name: "framework-media",
90+
defaults: ["framework-module-defaults"],
9891

99-
droidstubs {
100-
name: "framework-media-stubs-srcs-publicapi",
101-
defaults: [
102-
"framework-media-stubs-srcs-defaults",
103-
"framework-module-stubs-defaults-publicapi",
104-
],
105-
check_api: {
106-
last_released: {
107-
api_file: ":framework-media.api.public.latest",
108-
removed_api_file: ":framework-media-removed.api.public.latest",
109-
},
110-
api_lint: {
111-
new_since: ":framework-media.api.public.latest",
112-
},
113-
},
114-
}
92+
// This is only used to define the APIs for updatable-media.
93+
api_only: true,
11594

116-
droidstubs {
117-
name: "framework-media-stubs-srcs-systemapi",
118-
defaults: [
119-
"framework-media-stubs-srcs-defaults",
120-
"framework-module-stubs-defaults-systemapi",
95+
srcs: [
96+
":updatable-media-srcs",
12197
],
122-
check_api: {
123-
last_released: {
124-
api_file: ":framework-media.api.system.latest",
125-
removed_api_file: ":framework-media-removed.api.system.latest",
126-
},
127-
api_lint: {
128-
new_since: ":framework-media.api.system.latest",
129-
},
130-
},
131-
}
13298

133-
droidstubs {
134-
name: "framework-media-api-module_libs_api",
135-
defaults: [
136-
"framework-media-stubs-srcs-defaults",
137-
"framework-module-api-defaults-module_libs_api",
138-
],
139-
check_api: {
140-
last_released: {
141-
api_file: ":framework-media.api.module-lib.latest",
142-
removed_api_file: ":framework-media-removed.api.module-lib.latest",
143-
},
144-
api_lint: {
145-
new_since: ":framework-media.api.module-lib.latest",
146-
},
147-
},
148-
}
99+
// TODO(b/155480189) - Remove naming_scheme once references have been resolved.
100+
// Temporary java_sdk_library component naming scheme to use to ease the transition from separate
101+
// modules to java_sdk_library.
102+
naming_scheme: "framework-modules",
149103

150-
droidstubs {
151-
name: "framework-media-stubs-srcs-module_libs_api",
152-
defaults: [
153-
"framework-media-stubs-srcs-defaults",
154-
"framework-module-stubs-defaults-module_libs_api",
104+
libs: [
105+
"framework_media_annotation",
155106
],
156-
}
157107

158-
java_library {
159-
name: "framework-media-stubs-publicapi",
160-
srcs: [":framework-media-stubs-srcs-publicapi"],
161-
defaults: ["framework-module-stubs-lib-defaults-publicapi"],
162-
dist: { dest: "framework-media.jar" },
163-
}
164-
165-
java_library {
166-
name: "framework-media-stubs-systemapi",
167-
srcs: [":framework-media-stubs-srcs-systemapi"],
168-
defaults: ["framework-module-stubs-lib-defaults-systemapi"],
169-
dist: { dest: "framework-media.jar" },
108+
visibility: ["//frameworks/av/apex:__subpackages__"],
170109
}
171110

172-
java_library {
173-
name: "framework-media-stubs-module_libs_api",
174-
srcs: [":framework-media-stubs-srcs-module_libs_api"],
175-
defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
176-
dist: { dest: "framework-media.jar" },
177-
}
178111

179112
java_library {
180113
name: "framework_media_annotation",

0 commit comments

Comments
 (0)