diff options
author | Jaewoong Jung <jungjw@google.com> | 2020-06-02 17:52:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-02 17:52:04 +0000 |
commit | 3a2f2555d3f594f0d160b91c806a61f09f311d86 (patch) | |
tree | e1ad9714a372ff8e7c82fa514a436c79bbf3dfc2 | |
parent | cdcf0feafaedf844390522b81cd2c48ec2b08d7d (diff) | |
parent | 053448f67572dca487b0b294337ff0d8e954a6c1 (diff) | |
download | ca-certificates-3a2f2555d3f594f0d160b91c806a61f09f311d86.tar.gz |
Update prebuilt_etc package name. am: b2e30ce5cc am: 1bfb2b4215 am: 2860f36158 am: 67e4ef99ff am: 053448f675
Original change: undetermined
Change-Id: If0edb450dbddb1857fb131866bb7ae15dd98b059
-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) |