Snap for 6560464 from 1f4f211d8d7675643799b00e24b5e57ade9f0af1 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-s1-releaseandroid11-release

Change-Id: I2c0d200d874f3541743437b59ef62737ad662226

2 files changed, 4 insertions, 2 deletions

diff --git a/soong/Android.bp b/soong/Android.bp
index 252d314..8e9789b 100644
--- a/soong/Android.bp
+++ b/soong/Android.bp
@@ -3,6 +3,7 @@ bootstrap_go_package {
     pkgPath: "android/soong/system/ca-certificates",
     deps: [
         "soong-android",
+        "soong-etc",
         "soong-phony",
     ],
     srcs: [
diff --git a/soong/ca_certificates.go b/soong/ca_certificates.go
index fa6f141..0cddd22 100644
--- a/soong/ca_certificates.go
+++ b/soong/ca_certificates.go
@@ -7,6 +7,7 @@ import (
 	"github.com/google/blueprint/proptools"
 
 	"android/soong/android"
+	"android/soong/etc"
 	"android/soong/phony"
 )
 
@@ -62,7 +63,7 @@ func caCertificatesFactory() android.Module {
 	p := phony.PhonyFactory()
 	c := &caCertificatesProperties{}
 	android.AddLoadHook(p, func(ctx android.LoadHookContext) {
-		caCertificatesLoadHook(ctx, android.PrebuiltEtcFactory, c)
+		caCertificatesLoadHook(ctx, etc.PrebuiltEtcFactory, c)
 	})
 	p.AddProperties(c)
 
@@ -73,7 +74,7 @@ func caCertificatesHostFactory() android.Module {
 	p := phony.PhonyFactory()
 	c := &caCertificatesProperties{}
 	android.AddLoadHook(p, func(ctx android.LoadHookContext) {
-		caCertificatesLoadHook(ctx, android.PrebuiltEtcHostFactory, c)
+		caCertificatesLoadHook(ctx, etc.PrebuiltEtcHostFactory, c)
 	})
 	p.AddProperties(c)