From 4b79e98a6e4f882d6bbb882e9fed626e0c490bd7 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Mon, 1 Jun 2020 10:45:49 -0700 Subject: Soong package structure refactoring Give prebuilt_etc and sh_binary their own packages and split the gigantic main Android.bp up to small, per-package ones. Test: m nothing, TreeHugger Bug: 156980228 Change-Id: I7b00cd344b9f16861f1ff39edf0029f016b853d0 --- apex/apex_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index 29bd087c6..779119c27 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -29,7 +29,9 @@ import ( "android/soong/android" "android/soong/cc" "android/soong/dexpreopt" + prebuilt_etc "android/soong/etc" "android/soong/java" + "android/soong/sh" ) var buildDir string @@ -230,9 +232,9 @@ func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*andr ctx.RegisterModuleType("cc_test", cc.TestFactory) ctx.RegisterModuleType("vndk_prebuilt_shared", cc.VndkPrebuiltSharedFactory) ctx.RegisterModuleType("vndk_libraries_txt", cc.VndkLibrariesTxtFactory) - ctx.RegisterModuleType("prebuilt_etc", android.PrebuiltEtcFactory) + ctx.RegisterModuleType("prebuilt_etc", prebuilt_etc.PrebuiltEtcFactory) ctx.RegisterModuleType("platform_compat_config", java.PlatformCompatConfigFactory) - ctx.RegisterModuleType("sh_binary", android.ShBinaryFactory) + ctx.RegisterModuleType("sh_binary", sh.ShBinaryFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) java.RegisterJavaBuildComponents(ctx) java.RegisterSystemModulesBuildComponents(ctx) -- cgit v1.2.3-59-g8ed1b