Enable android build. (#78)

taste1981 · taste1981 · commit 2905d03e24bc · 2021-01-04T09:43:53.000+08:00
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
@@ -55,7 +55,7 @@ if (is_android) {
       ":video_api_java",
       ":video_java",
       "../../modules/audio_device:audio_device_java",
-      "../../rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
     ]
   }
 
@@ -90,8 +90,8 @@ if (is_android) {
       ":surfaceviewrenderer_java",
       ":video_api_java",
       ":video_java",
-      "//modules/audio_device:audio_device_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/modules/audio_device:audio_device_java",
+      "//third_party/webrtc/rtc_base:base_java",
     ]
   }
 
@@ -186,7 +186,7 @@ if (is_android) {
 
     deps = [
       ":base_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
     ]
   }
 
@@ -207,7 +207,7 @@ if (is_android) {
 
     deps = [
       ":base_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
       "//third_party/android_deps:com_android_support_support_annotations_java",
     ]
   }
@@ -249,7 +249,7 @@ if (is_android) {
     deps = [
       ":base_java",
       ":video_api_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
       "//third_party/android_deps:com_android_support_support_annotations_java",
     ]
   }
@@ -355,7 +355,7 @@ if (is_android) {
       ":base_java",
       ":video_api_java",
       ":video_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
       "//third_party/android_deps:com_android_support_support_annotations_java",
     ]
   }
@@ -387,7 +387,7 @@ if (is_android) {
       ":base_java",
       ":video_api_java",
       ":video_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
     ]
   }
 
@@ -416,7 +416,7 @@ if (is_android) {
       ":base_java",
       ":video_api_java",
       ":video_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
       "//third_party/android_deps:com_android_support_support_annotations_java",
     ]
   }
@@ -436,7 +436,7 @@ if (is_android) {
     deps = [
       ":audio_api_java",
       ":base_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
       "//third_party/android_deps:com_android_support_support_annotations_java",
     ]
   }
@@ -458,7 +458,7 @@ if (is_android) {
     deps = [
       ":video_api_java",
       ":video_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
       "//third_party/android_deps:com_android_support_support_annotations_java",
     ]
   }
@@ -474,7 +474,7 @@ if (is_android) {
       ":base_java",
       ":video_api_java",
       ":video_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
     ]
   }
 
@@ -488,7 +488,7 @@ if (is_android) {
       ":base_java",
       ":video_api_java",
       ":video_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
     ]
   }
 
@@ -502,7 +502,7 @@ if (is_android) {
       ":base_java",
       ":video_api_java",
       ":video_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
     ]
   }
 
@@ -519,7 +519,7 @@ if (is_android) {
       ":libvpx_vp9_java",
       ":video_api_java",
       ":video_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
       "//third_party/android_deps:com_android_support_support_annotations_java",
     ]
   }
@@ -855,8 +855,8 @@ if (current_os == "linux" || is_android) {
     deps = [
       ":base_jni",
       ":native_api_jni",
-      "//rtc_base",
-      "//rtc_base:checks",
+      "//third_party/webrtc/rtc_base",
+      "//third_party/webrtc/rtc_base:checks",
     ]
   }
 
@@ -900,9 +900,9 @@ if (current_os == "linux" || is_android) {
       ":base_jni",
       ":native_api_jni",
       ":video_jni",
-      "//api/video_codecs:video_codecs_api",
-      "//rtc_base:checks",
-      "//rtc_base:rtc_base_approved",
+      "//third_party/webrtc/api/video_codecs:video_codecs_api",
+      "//third_party/webrtc/rtc_base:checks",
+      "//third_party/webrtc/rtc_base:rtc_base_approved",
     ]
   }
 
@@ -929,9 +929,9 @@ if (current_os == "linux" || is_android) {
     deps = [
       ":base_jni",
       ":peerconnection_jni",
-      "//api:libjingle_peerconnection_api",
-      "//api/video_codecs:video_codecs_api",
-      "//rtc_base",
+      "//third_party/webrtc/api:libjingle_peerconnection_api",
+      "//third_party/webrtc/api/video_codecs:video_codecs_api",
+      "//third_party/webrtc/rtc_base",
     ]
   }
 
@@ -967,12 +967,12 @@ if (current_os == "linux" || is_android) {
       ":native_api_jni",
       ":video_jni",
       ":videoframe_jni",
-      "//api:libjingle_peerconnection_api",
-      "//api:media_stream_interface",
-      "//api/video:video_frame",
-      "//api/video:video_rtp_headers",
-      "//rtc_base",
-      "//rtc_base:rtc_base_approved",
+      "//third_party/webrtc/api:libjingle_peerconnection_api",
+      "//third_party/webrtc/api:media_stream_interface",
+      "//third_party/webrtc/api/video:video_frame",
+      "//third_party/webrtc/api/video:video_rtp_headers",
+      "//third_party/webrtc/rtc_base",
+      "//third_party/webrtc/rtc_base:rtc_base_approved",
     ]
   }
 
@@ -985,7 +985,7 @@ if (current_os == "linux" || is_android) {
 
     deps = [
       ":base_java",
-      "//rtc_base:base_java",
+      "//third_party/webrtc/rtc_base:base_java",
     ]
   }
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ if (is_android) {`
`55`	`55`	`":video_api_java",`
`56`	`56`	`":video_java",`
`57`	`57`	`"../../modules/audio_device:audio_device_java",`
`58`		`- "../../rtc_base:base_java",`
	`58`	`+ "//third_party/webrtc/rtc_base:base_java",`
`59`	`59`	`]`
`60`	`60`	`}`
`61`	`61`
`@@ -90,8 +90,8 @@ if (is_android) {`
`90`	`90`	`":surfaceviewrenderer_java",`
`91`	`91`	`":video_api_java",`
`92`	`92`	`":video_java",`
`93`		`- "//modules/audio_device:audio_device_java",`
`94`		`- "//rtc_base:base_java",`
	`93`	`+ "//third_party/webrtc/modules/audio_device:audio_device_java",`
	`94`	`+ "//third_party/webrtc/rtc_base:base_java",`
`95`	`95`	`]`
`96`	`96`	`}`
`97`	`97`
`@@ -186,7 +186,7 @@ if (is_android) {`
`186`	`186`
`187`	`187`	`deps = [`
`188`	`188`	`":base_java",`
`189`		`- "//rtc_base:base_java",`
	`189`	`+ "//third_party/webrtc/rtc_base:base_java",`
`190`	`190`	`]`
`191`	`191`	`}`
`192`	`192`
`@@ -207,7 +207,7 @@ if (is_android) {`
`207`	`207`
`208`	`208`	`deps = [`
`209`	`209`	`":base_java",`
`210`		`- "//rtc_base:base_java",`
	`210`	`+ "//third_party/webrtc/rtc_base:base_java",`
`211`	`211`	`"//third_party/android_deps:com_android_support_support_annotations_java",`
`212`	`212`	`]`
`213`	`213`	`}`
`@@ -249,7 +249,7 @@ if (is_android) {`
`249`	`249`	`deps = [`
`250`	`250`	`":base_java",`
`251`	`251`	`":video_api_java",`
`252`		`- "//rtc_base:base_java",`
	`252`	`+ "//third_party/webrtc/rtc_base:base_java",`
`253`	`253`	`"//third_party/android_deps:com_android_support_support_annotations_java",`
`254`	`254`	`]`
`255`	`255`	`}`
`@@ -355,7 +355,7 @@ if (is_android) {`
`355`	`355`	`":base_java",`
`356`	`356`	`":video_api_java",`
`357`	`357`	`":video_java",`
`358`		`- "//rtc_base:base_java",`
	`358`	`+ "//third_party/webrtc/rtc_base:base_java",`
`359`	`359`	`"//third_party/android_deps:com_android_support_support_annotations_java",`
`360`	`360`	`]`
`361`	`361`	`}`
`@@ -387,7 +387,7 @@ if (is_android) {`
`387`	`387`	`":base_java",`
`388`	`388`	`":video_api_java",`
`389`	`389`	`":video_java",`
`390`		`- "//rtc_base:base_java",`
	`390`	`+ "//third_party/webrtc/rtc_base:base_java",`
`391`	`391`	`]`
`392`	`392`	`}`
`393`	`393`
`@@ -416,7 +416,7 @@ if (is_android) {`
`416`	`416`	`":base_java",`
`417`	`417`	`":video_api_java",`
`418`	`418`	`":video_java",`
`419`		`- "//rtc_base:base_java",`
	`419`	`+ "//third_party/webrtc/rtc_base:base_java",`
`420`	`420`	`"//third_party/android_deps:com_android_support_support_annotations_java",`
`421`	`421`	`]`
`422`	`422`	`}`
`@@ -436,7 +436,7 @@ if (is_android) {`
`436`	`436`	`deps = [`
`437`	`437`	`":audio_api_java",`
`438`	`438`	`":base_java",`
`439`		`- "//rtc_base:base_java",`
	`439`	`+ "//third_party/webrtc/rtc_base:base_java",`
`440`	`440`	`"//third_party/android_deps:com_android_support_support_annotations_java",`
`441`	`441`	`]`
`442`	`442`	`}`
`@@ -458,7 +458,7 @@ if (is_android) {`
`458`	`458`	`deps = [`
`459`	`459`	`":video_api_java",`
`460`	`460`	`":video_java",`
`461`		`- "//rtc_base:base_java",`
	`461`	`+ "//third_party/webrtc/rtc_base:base_java",`
`462`	`462`	`"//third_party/android_deps:com_android_support_support_annotations_java",`
`463`	`463`	`]`
`464`	`464`	`}`
`@@ -474,7 +474,7 @@ if (is_android) {`
`474`	`474`	`":base_java",`
`475`	`475`	`":video_api_java",`
`476`	`476`	`":video_java",`
`477`		`- "//rtc_base:base_java",`
	`477`	`+ "//third_party/webrtc/rtc_base:base_java",`
`478`	`478`	`]`
`479`	`479`	`}`
`480`	`480`
`@@ -488,7 +488,7 @@ if (is_android) {`
`488`	`488`	`":base_java",`
`489`	`489`	`":video_api_java",`
`490`	`490`	`":video_java",`
`491`		`- "//rtc_base:base_java",`
	`491`	`+ "//third_party/webrtc/rtc_base:base_java",`
`492`	`492`	`]`
`493`	`493`	`}`
`494`	`494`
`@@ -502,7 +502,7 @@ if (is_android) {`
`502`	`502`	`":base_java",`
`503`	`503`	`":video_api_java",`
`504`	`504`	`":video_java",`
`505`		`- "//rtc_base:base_java",`
	`505`	`+ "//third_party/webrtc/rtc_base:base_java",`
`506`	`506`	`]`
`507`	`507`	`}`
`508`	`508`
`@@ -519,7 +519,7 @@ if (is_android) {`
`519`	`519`	`":libvpx_vp9_java",`
`520`	`520`	`":video_api_java",`
`521`	`521`	`":video_java",`
`522`		`- "//rtc_base:base_java",`
	`522`	`+ "//third_party/webrtc/rtc_base:base_java",`
`523`	`523`	`"//third_party/android_deps:com_android_support_support_annotations_java",`
`524`	`524`	`]`
`525`	`525`	`}`
`@@ -855,8 +855,8 @@ if (current_os == "linux" \|\| is_android) {`
`855`	`855`	`deps = [`
`856`	`856`	`":base_jni",`
`857`	`857`	`":native_api_jni",`
`858`		`- "//rtc_base",`
`859`		`- "//rtc_base:checks",`
	`858`	`+ "//third_party/webrtc/rtc_base",`
	`859`	`+ "//third_party/webrtc/rtc_base:checks",`
`860`	`860`	`]`
`861`	`861`	`}`
`862`	`862`
`@@ -900,9 +900,9 @@ if (current_os == "linux" \|\| is_android) {`
`900`	`900`	`":base_jni",`
`901`	`901`	`":native_api_jni",`
`902`	`902`	`":video_jni",`
`903`		`- "//api/video_codecs:video_codecs_api",`
`904`		`- "//rtc_base:checks",`
`905`		`- "//rtc_base:rtc_base_approved",`
	`903`	`+ "//third_party/webrtc/api/video_codecs:video_codecs_api",`
	`904`	`+ "//third_party/webrtc/rtc_base:checks",`
	`905`	`+ "//third_party/webrtc/rtc_base:rtc_base_approved",`
`906`	`906`	`]`
`907`	`907`	`}`
`908`	`908`
`@@ -929,9 +929,9 @@ if (current_os == "linux" \|\| is_android) {`
`929`	`929`	`deps = [`
`930`	`930`	`":base_jni",`
`931`	`931`	`":peerconnection_jni",`
`932`		`- "//api:libjingle_peerconnection_api",`
`933`		`- "//api/video_codecs:video_codecs_api",`
`934`		`- "//rtc_base",`
	`932`	`+ "//third_party/webrtc/api:libjingle_peerconnection_api",`
	`933`	`+ "//third_party/webrtc/api/video_codecs:video_codecs_api",`
	`934`	`+ "//third_party/webrtc/rtc_base",`
`935`	`935`	`]`
`936`	`936`	`}`
`937`	`937`
`@@ -967,12 +967,12 @@ if (current_os == "linux" \|\| is_android) {`
`967`	`967`	`":native_api_jni",`
`968`	`968`	`":video_jni",`
`969`	`969`	`":videoframe_jni",`
`970`		`- "//api:libjingle_peerconnection_api",`
`971`		`- "//api:media_stream_interface",`
`972`		`- "//api/video:video_frame",`
`973`		`- "//api/video:video_rtp_headers",`
`974`		`- "//rtc_base",`
`975`		`- "//rtc_base:rtc_base_approved",`
	`970`	`+ "//third_party/webrtc/api:libjingle_peerconnection_api",`
	`971`	`+ "//third_party/webrtc/api:media_stream_interface",`
	`972`	`+ "//third_party/webrtc/api/video:video_frame",`
	`973`	`+ "//third_party/webrtc/api/video:video_rtp_headers",`
	`974`	`+ "//third_party/webrtc/rtc_base",`
	`975`	`+ "//third_party/webrtc/rtc_base:rtc_base_approved",`
`976`	`976`	`]`
`977`	`977`	`}`
`978`	`978`
`@@ -985,7 +985,7 @@ if (current_os == "linux" \|\| is_android) {`
`985`	`985`
`986`	`986`	`deps = [`
`987`	`987`	`":base_java",`
`988`		`- "//rtc_base:base_java",`
	`988`	`+ "//third_party/webrtc/rtc_base:base_java",`
`989`	`989`	`]`
`990`	`990`	`}`
`991`	`991`