diff options
author | Jaewoong Jung <jungjw@google.com> | 2020-06-02 16:45:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-02 16:45:48 +0000 |
commit | 1bfb2b42158b24a1d30fc2fab0728e74c03aa332 (patch) | |
tree | b2bc7cc89e459c3ad59bc6e235f5c8d20d97bcb6 | |
parent | f5946ce8e7753603ea9cb97e6851de58d453f169 (diff) | |
parent | b2e30ce5cc6171d1c5b1ae7a8f6673d42056c000 (diff) | |
download | ca-certificates-1bfb2b42158b24a1d30fc2fab0728e74c03aa332.tar.gz |
Update prebuilt_etc package name. am: b2e30ce5ccandroid-r-beta-3android-r-beta-2
Original change: undetermined
Change-Id: Id7eac68690c7e71f7eaf22fcabcf8a877c08beee
-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) |