diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-04 21:41:54 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-04 21:41:54 +0000 |
| commit | 8eebf2d552eca4cd94836aba1da0850bba8646f4 (patch) | |
| tree | e1ad9714a372ff8e7c82fa514a436c79bbf3dfc2 | |
| parent | cdcf0feafaedf844390522b81cd2c48ec2b08d7d (diff) | |
| parent | 61980a2afb319198af92e53ad82c01ce74f028b4 (diff) | |
| download | ca-certificates-android11-mainline-release.tar.gz | |
Snap for 6559824 from 61980a2afb319198af92e53ad82c01ce74f028b4 to mainline-releaser_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r10android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-release
Change-Id: I2e75fcef67d065854f95b88e22e8b62a35744513
| -rw-r--r-- | soong/Android.bp | 1 | ||||
| -rw-r--r-- | soong/ca_certificates.go | 5 |
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) |