Fixing package-boundary violation with srjar_deps

webrtc/modules/audio_device/BUILD.gn

Index: webrtc/modules/audio_device/BUILD.gn
diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index 22941484b2df4dec5bdb5a17f7f7fd095e7141be..c475da0206211b26e7ba81e4db0a7819f4c2c26c 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -6,7 +6,9 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-import("../../build/webrtc.gni")
+import("//webrtc/build/webrtc.gni")

[kjellander_webrtc, 2017/01/04 14:25:21]

Please restore this one. Otherwise it'll break in Chromium.

[mbonadei, 2017/01/04 15:19:06]

Acknowledged. 

Ok, I was wondering why there was the relative path. :)

+import("//build/config/android/config.gni")
+import("//build/config/android/rules.gni")
 
 config("audio_device_config") {
   include_dirs = [
@@ -296,3 +298,41 @@ if (rtc_include_tests && !is_ios) {
     public_configs = [ ":audio_device_config" ]
   }
 }
+
+if (is_android) {
+  template("android_shared_srcjar") {

[kjellander_webrtc, 2017/01/04 14:25:21]

Let's put this template into webrtc/build/webrtc.gni right away.

[mbonadei, 2017/01/04 15:19:06]

Acknowledged.

+    action(target_name) {
+      check_includes = false
+      set_sources_assignment_filter([])
+      assert(defined(invoker.sources))
+
+      forward_variables_from(invoker,
+                             [
+                               "sources",
+                               "testonly",
+                               "visibility",
+                             ])
+      script = "//webrtc/generate_srcjar.py"
+      _srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
+      _rebased_srcjar_path = rebase_path(_srcjar_path, root_build_dir)
+      _rebased_sources = rebase_path(invoker.sources, root_build_dir)
+
+      args = [ "--srcjar=$_rebased_srcjar_path" ] + _rebased_sources
+
+      outputs = [
+        _srcjar_path,
+      ]
+    }
+  }
+
+  android_shared_srcjar("audio_device_java") {
+    sources = [
+      "android/java/src/org/webrtc/voiceengine/BuildInfo.java",
+      "android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java",
+      "android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java",
+      "android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java",
+      "android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java",
+      "android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java",
+    ]
+  }
+}