cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update mediapipe_aar.bzl to put more mediapipe framework java proto classes into AARs.

Browse Source 
PiperOrigin-RevId: 480583365
This commit is contained in:
Jiuqiang Tang 2022-10-12 03:44:52 -07:00 committed by Copybara-Service
parent f9a4e472eb
commit cbbd4718a0
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mediapipe/java/com/google/mediapipe/mediapipe_aar.bzl
View File

@ -164,7 +164,10 @@ EOF
assets_dir = assets_dir, assets_dir = assets_dir,
) )
_aar_with_jni(name, name + "_android_lib") mediapipe_build_aar_with_jni(
name = name,
android_library = name + "_android_lib",
)
def _mediapipe_jni(name, gen_libmediapipe, calculators = []): def _mediapipe_jni(name, gen_libmediapipe, calculators = []):
"""Generates MediaPipe jni library. """Generates MediaPipe jni library.
@ -203,7 +206,14 @@ def _mediapipe_jni(name, gen_libmediapipe, calculators = []):
alwayslink = 1, alwayslink = 1,
) )
def _aar_with_jni(name, android_library): def mediapipe_build_aar_with_jni(name, android_library):
"""Builds MediaPipe AAR with jni.
Args:
name: The bazel target name.
android_library: the android library that contains jni.
"""
# Generates dummy AndroidManifest.xml for dummy apk usage # Generates dummy AndroidManifest.xml for dummy apk usage
# (dummy apk is generated by <name>_dummy_app target below) # (dummy apk is generated by <name>_dummy_app target below)
native.genrule( native.genrule(
@ -214,7 +224,7 @@ cat > $(OUTS) <<EOF
<manifest <manifest
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
package="dummy.package.for.so"> package="dummy.package.for.so">
<uses-sdk android:minSdkVersion="21"/> <uses-sdk android:minSdkVersion="24"/>
</manifest> </manifest>
EOF EOF
""", """,
@ -241,6 +251,7 @@ chmod +w $(location :{}.aar)
origdir=$$PWD origdir=$$PWD
cd $$(mktemp -d) cd $$(mktemp -d)
unzip $$origdir/$(location :{}_dummy_app_unsigned.apk) "lib/*" unzip $$origdir/$(location :{}_dummy_app_unsigned.apk) "lib/*"
find lib -name *_dummy_app.so -delete
cp -r lib jni cp -r lib jni
zip -r $$origdir/$(location :{}.aar) jni/*/*.so zip -r $$origdir/$(location :{}.aar) jni/*/*.so
""".format(android_library, name, name, name, name), """.format(android_library, name, name, name, name),
@ -287,6 +298,36 @@ def mediapipe_java_proto_srcs(name = ""):
src_out = "com/google/mediapipe/proto/CalculatorProto.java", src_out = "com/google/mediapipe/proto/CalculatorProto.java",
)) ))
proto_src_list.append(mediapipe_java_proto_src_extractor(
target = "//mediapipe/framework:calculator_options_java_proto_lite",
src_out = "com/google/mediapipe/proto/CalculatorOptionsProto.java",
))
proto_src_list.append(mediapipe_java_proto_src_extractor(
target = "//mediapipe/framework:stream_handler_java_proto_lite",
src_out = "com/google/mediapipe/proto/StreamHandlerProto.java",
))
proto_src_list.append(mediapipe_java_proto_src_extractor(
target = "//mediapipe/framework:packet_factory_java_proto_lite",
src_out = "com/google/mediapipe/proto/PacketFactoryProto.java",
))
proto_src_list.append(mediapipe_java_proto_src_extractor(
target = "//mediapipe/framework:packet_generator_java_proto_lite",
src_out = "com/google/mediapipe/proto/PacketGeneratorProto.java",
))
proto_src_list.append(mediapipe_java_proto_src_extractor(
target = "//mediapipe/framework:status_handler_java_proto_lite",
src_out = "com/google/mediapipe/proto/StatusHandlerProto.java",
))
proto_src_list.append(mediapipe_java_proto_src_extractor(
target = "//mediapipe/framework:mediapipe_options_java_proto_lite",
src_out = "com/google/mediapipe/proto/MediaPipeOptionsProto.java",
))
proto_src_list.append(mediapipe_java_proto_src_extractor( proto_src_list.append(mediapipe_java_proto_src_extractor(
target = "//mediapipe/framework/formats:landmark_java_proto_lite", target = "//mediapipe/framework/formats:landmark_java_proto_lite",
src_out = "com/google/mediapipe/formats/proto/LandmarkProto.java", src_out = "com/google/mediapipe/formats/proto/LandmarkProto.java",