commit ed62b9cc2a24dd0874f8689902bad759a722497a
author Paul Duffin <paulduffin@google.com> Tue Jun 16 16:12:50 2020 +0100
committer Paul Duffin <paulduffin@google.com> Fri Jul 10 12:18:03 2020 +0100
tree b3f7652274ecaaece272a634187e897ce70700dc
parent 8f91f7d8025a93994058ee50566e9b31e257429f

Differentiate sdk snapshot include dir by os type

Test: m nothing
Change-Id: Ide032aa64bb1fee69969c5e007bee6643d475309

sdk/cc_sdk_test.go

diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go
index c59cd30..b168cd0 100644
--- a/sdk/cc_sdk_test.go
+++ b/sdk/cc_sdk_test.go
@@ -1614,13 +1614,13 @@
     sdk_member_name: "mynativeheaders",
     host_supported: true,
     stl: "none",
-    export_system_include_dirs: ["include/include"],
+    export_system_include_dirs: ["common_os/include/include"],
     target: {
         android: {
-            export_include_dirs: ["include/include-android"],
+            export_include_dirs: ["android/include/include-android"],
         },
         linux_glibc: {
-            export_include_dirs: ["include/include-host"],
+            export_include_dirs: ["linux_glibc/include/include-host"],
         },
     },
 }
@@ -1630,13 +1630,13 @@
     prefer: false,
     host_supported: true,
     stl: "none",
-    export_system_include_dirs: ["include/include"],
+    export_system_include_dirs: ["common_os/include/include"],
     target: {
         android: {
-            export_include_dirs: ["include/include-android"],
+            export_include_dirs: ["android/include/include-android"],
         },
         linux_glibc: {
-            export_include_dirs: ["include/include-host"],
+            export_include_dirs: ["linux_glibc/include/include-host"],
         },
     },
 }
@@ -1648,9 +1648,9 @@
 }
 `),
 		checkAllCopyRules(`
-include/Test.h -> include/include/Test.h
-include-android/AndroidTest.h -> include/include-android/AndroidTest.h
-include-host/HostTest.h -> include/include-host/HostTest.h
+include/Test.h -> common_os/include/include/Test.h
+include-android/AndroidTest.h -> android/include/include-android/AndroidTest.h
+include-host/HostTest.h -> linux_glibc/include/include-host/HostTest.h
 `),
 	)
 }