From 1f4f211d8d7675643799b00e24b5e57ade9f0af1 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Mon, 1 Jun 2020 11:30:22 -0700 Subject: Update prebuilt_etc package name. (This is a cherry-pick change.) Test: m nothing + TreeHugger Bug: 156980228 Change-Id: I9ea5bf3b53c0bc3172f2be11439c91a33fdecf64 Merged-In: I9ea5bf3b53c0bc3172f2be11439c91a33fdecf64 --- soong/Android.bp | 1 + 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) -- cgit v1.2.3