Revert build changes

Author: clholgat

bin/BUILD.bazel

@@ -6,8 +6,6 @@ load(
     "pngquant_linux",
     "pngquant_macos",
     "valdi_compiler_companion_files",
-    "valdi_compiler_linux",
-    "valdi_compiler_macos",
 )
 
 filegroup(
@@ -20,8 +18,8 @@ native_binary(
     name = "valdi_compiler",
     src = select(
         {
-            "@bazel_tools//src/conditions:darwin": valdi_compiler_macos(),
-            "@bazel_tools//src/conditions:linux_x86_64": valdi_compiler_linux(),
+            "@bazel_tools//src/conditions:darwin": "@valdi_compiler_macos//:valdi_compiler",
+            "@bazel_tools//src/conditions:linux_x86_64": "@valdi_compiler_linux//:valdi_compiler",
         },
     ),
     out = "valdi_compiler",

bzl/prebuilt_tools.bzl

@@ -12,16 +12,6 @@ def pngquant_macos():
         return "@valdi_pngquant_macos//:pngquant"
     return "pngquant/macos/pngquant"
 
-def valdi_compiler_macos():
-    if INTERNAL_BUILD:
-        pass
-    return "compiler/macos/valdi_compiler"
-
-def valdi_compiler_linux():
-    if INTERNAL_BUILD:
-        pass
-    return "compiler/linux/valdi_compiler"
-
 def valdi_compiler_companion_files():
     if INTERNAL_BUILD:
         return ["@valdi_compiler_companion//:all_files"]

bzl/valdi/valdi_exported_library.bzl

@@ -1,5 +1,6 @@
 load("@build_bazel_rules_apple//apple:apple.bzl", "apple_xcframework")
 load("//bzl:expand_template.bzl", "expand_template")
+load("//bzl/android:collect_android_assets.bzl", "collect_android_assets")
 load("//bzl/valdi:rewrite_hdrs.bzl", "rewrite_hdrs")
 load("//bzl/valdi:suffixed_deps.bzl", "get_suffixed_deps")
 load("//bzl/valdi:valdi_collapse_web_paths.bzl", "collapse_native_paths", "collapse_web_paths")
@@ -76,6 +77,28 @@ def valdi_exported_library(
 
     java_deps = java_deps + get_suffixed_deps(deps, "_kt")
 
+    collect_android_assets(
+        name = "{}_android_assets".format(name),
+        valdi_deps = deps,
+        deps = java_deps,
+        output_target = source_set_select(
+            debug = "debug",
+            release = "release",
+        ),
+    )
+
+    valdi_android_aar(
+        name = "{}_android".format(name),
+        java_deps = java_deps,
+        native_deps = [
+            "@valdi//valdi",
+        ] + get_suffixed_deps(deps, "_native"),
+        additional_assets = [":{}_android_assets".format(name)],
+        excluded_class_path_patterns = android_excluded_class_path_patterns,
+        so_name = "lib{}.so".format(name),
+        tags = ["valdi_android_exported_library"],
+    )
+
     package_name = web_package_name
     if npm_scope:
         package_name = npm_scope + "/" + package_name