diff --git a/aconfig/codegen/cc_aconfig_library.go b/aconfig/codegen/cc_aconfig_library.go
index 2d3ee39..d5291fc 100644
--- a/aconfig/codegen/cc_aconfig_library.go
+++ b/aconfig/codegen/cc_aconfig_library.go
@@ -36,7 +36,6 @@
 const libBaseDep = "libbase"
 const libLogDep = "liblog"
 const libAconfigStorageReadApiCcDep = "libaconfig_storage_read_api_cc"
-const libAconfigStorageProtosCcDep = "libaconfig_storage_protos_cc"
 
 type CcAconfigLibraryProperties struct {
 	// name of the aconfig_declarations module to generate a library for
@@ -88,10 +87,10 @@
 	if mode != "force-read-only" {
 		deps.SharedLibs = append(deps.SharedLibs, baseLibDep)
 
-		deps.SharedLibs = append(deps.SharedLibs, libBaseDep)
-		deps.SharedLibs = append(deps.SharedLibs, libLogDep)
 		deps.SharedLibs = append(deps.SharedLibs, libAconfigStorageReadApiCcDep)
-		deps.SharedLibs = append(deps.SharedLibs, libAconfigStorageProtosCcDep)
+		deps.SharedLibs = append(deps.SharedLibs, libLogDep)
+
+		deps.StaticLibs = append(deps.StaticLibs, libBaseDep)
 	}
 	// TODO: It'd be really nice if we could reexport this library and not make everyone do it.
 
diff --git a/apex/aconfig_test.go b/apex/aconfig_test.go
index 3de9286..726041c 100644
--- a/apex/aconfig_test.go
+++ b/apex/aconfig_test.go
@@ -165,6 +165,9 @@
 				cc_library {
 					name: "libbase",
 					srcs: ["libbase.cc"],
+			                apex_available: [
+				            "myapex",
+			                ],
 				}
 				cc_library {
 					name: "libaconfig_storage_read_api_cc",
@@ -425,6 +428,9 @@
 				cc_library {
 					name: "libbase",
 					srcs: ["libbase.cc"],
+			                apex_available: [
+				            "myapex",
+			                ],
 				}
 				cc_library {
 					name: "libaconfig_storage_read_api_cc",
@@ -487,6 +493,9 @@
 				cc_library {
 					name: "libbase",
 					srcs: ["libbase.cc"],
+			                apex_available: [
+				            "myapex",
+			                ],
 				}
 				cc_library {
 					name: "libaconfig_storage_read_api_cc",
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 8a3735c..3e284b1 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -10694,6 +10694,9 @@
 		cc_library {
 			name: "libbase",
 			srcs: ["libbase.cc"],
+			apex_available: [
+				"myapex",
+			],
 		}
 		cc_library {
 			name: "libaconfig_storage_read_api_cc",