Revert "AIDL stub libs: on host"
This reverts commit a7c172c9837af35d25b49890e49acda37f6e6d7b.
Reason for revert: breaks Mac build
Bug: 141340885
Change-Id: I4aaa72aa6c766725e130602ef16a87c166cf791d
diff --git a/build/Android.bp b/build/Android.bp
index 9cf4125..44298a9 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -35,8 +35,6 @@
cc_defaults {
name: "aidl-cpp-module-defaults",
- // TODO(b/31559095): remove when host bionic is available
- defaults: ["libbinder_ndk_host_user"],
cflags: [
"-Wall",
"-Werror",
@@ -62,10 +60,9 @@
// Copy of test-piece-1 as test only. Creating a separate library because 'vendor_available' is
// contagious.
aidl_interface {
- name: "test-variants",
+ name: "test-vendor",
local_include_dir: "tests_1",
vendor_available: true,
- host_supported: true,
srcs: [
":aidl-test-filegroup",
],
diff --git a/build/aidl_interface.go b/build/aidl_interface.go
index dd37798..35336f7 100644
--- a/build/aidl_interface.go
+++ b/build/aidl_interface.go
@@ -578,10 +578,6 @@
// Whether the library can be installed on the vendor image.
Vendor_available *bool
-
- // Whether the library can be used on host
- Host_supported *bool
-
// Top level directories for includes.
// TODO(b/128940869): remove it if aidl_interface can depend on framework.aidl
Include_dirs []string
@@ -844,14 +840,14 @@
var sdkVersion *string
var stl *string
var cpp_std *string
- var host_supported *bool
-
if lang == langCpp {
importExportDependencies = append(importExportDependencies, "libbinder", "libutils")
if genLog {
libJSONCppDependency = []string{"libjsoncpp"}
}
- host_supported = i.properties.Host_supported
+ sdkVersion = nil
+ stl = nil
+ cpp_std = nil
} else if lang == langNdk {
importExportDependencies = append(importExportDependencies, "libbinder_ndk")
if genLog {
@@ -864,7 +860,6 @@
if genLog {
libJSONCppDependency = []string{"libjsoncpp"}
}
- host_supported = i.properties.Host_supported
} else {
panic("Unrecognized language: " + lang)
}
@@ -872,7 +867,6 @@
mctx.CreateModule(android.ModuleFactoryAdaptor(cc.LibraryFactory), &ccProperties{
Name: proptools.StringPtr(cppModuleGen),
Vendor_available: i.properties.Vendor_available,
- Host_supported: host_supported,
Defaults: []string{"aidl-cpp-module-defaults"},
Generated_sources: []string{cppSourceGen},
Generated_headers: []string{cppSourceGen},
diff --git a/build/properties.go b/build/properties.go
index b59db61..321ec71 100644
--- a/build/properties.go
+++ b/build/properties.go
@@ -30,7 +30,6 @@
Owner *string
Defaults []string
Vendor_available *bool
- Host_supported *bool
Generated_sources []string
Generated_headers []string
Shared sharedLib