Install VNDK libs in /system instead of /vendor
If BOARD_VNDK_VERSION is set, and a module is set to
`vendor_available: true` it is installed in /system and /vendor.
However, if the module is a VNDK library, it must be
installed at `/system/${LIB}/vndk` instead of /vendor/${LIB}.
For those modules, need following to set.
vendor_available: true,
vndk: {
enabled: true,
support_system_process: true,
},
`support_system_process` is optional to define.
If it is defined to true, the module is regarded as vndk-sp.
link-type check for VNDK modules is added to make sure that VNDK
modules only link to other VNDK shared libraries or LL-NDKs.
move the ABI checks to VNDK from all of vendor_available.
Bug: 38304436
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Test: Use `vendor_available_vndk: true` for VNDK modules and compile
with BOARD_VNDK_VERSION:=current
Change-Id: I409268e0b7f05a9d01697bf9f9f4726b5aac631f
diff --git a/cc/vndk.go b/cc/vndk.go
new file mode 100644
index 0000000..fd1bdcb
--- /dev/null
+++ b/cc/vndk.go
@@ -0,0 +1,98 @@
+// Copyright 2017 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cc
+
+import (
+ "android/soong/android"
+)
+
+type VndkProperties struct {
+ Vndk struct {
+ // declared as a VNDK or VNDK-SP module. The vendor variant
+ // will be installed in /system instead of /vendor partition.
+ //
+ // `vendor_available: true` must set to together for VNDK
+ // modules.
+ Enabled *bool
+
+ // declared as a VNDK-SP module, which is a subset of VNDK.
+ //
+ // `vndk: { enabled: true }` must set together.
+ //
+ // All these modules are allowed to link to VNDK-SP or LL-NDK
+ // modules only. Other dependency will cause link-type errors.
+ //
+ // If `support_system_process` is not set or set to false,
+ // the module is VNDK-core and can link to other VNDK-core,
+ // VNDK-SP or LL-NDK modules only.
+ Support_system_process *bool
+ }
+}
+
+type vndkdep struct {
+ Properties VndkProperties
+}
+
+func (vndk *vndkdep) props() []interface{} {
+ return []interface{}{&vndk.Properties}
+}
+
+func (vndk *vndkdep) begin(ctx BaseModuleContext) {}
+
+func (vndk *vndkdep) deps(ctx BaseModuleContext, deps Deps) Deps {
+ return deps
+}
+
+func (vndk *vndkdep) isVndk() bool {
+ return Bool(vndk.Properties.Vndk.Enabled)
+}
+
+func (vndk *vndkdep) isVndkSp() bool {
+ return Bool(vndk.Properties.Vndk.Support_system_process)
+}
+
+func (vndk *vndkdep) typeName() string {
+ if !vndk.isVndk() {
+ return "native:vendor"
+ }
+ if !vndk.isVndkSp() {
+ return "native:vendor:vndk"
+ }
+ return "native:vendor:vndksp"
+}
+
+func (vndk *vndkdep) vndkCheckLinkType(ctx android.ModuleContext, to *Module) {
+ if to.linker == nil {
+ return
+ }
+ if lib, ok := to.linker.(*libraryDecorator); !ok || !lib.shared() {
+ // Check only shared libraries.
+ // Other (static and LL-NDK) libraries are allowed to link.
+ return
+ }
+ if !to.Properties.UseVndk {
+ ctx.ModuleErrorf("(%s) should not link to %q which is not a vendor-available library",
+ vndk.typeName(), to.Name())
+ return
+ }
+ if to.vndkdep == nil {
+ return
+ }
+ if (vndk.isVndk() && !to.vndkdep.isVndk()) || (vndk.isVndkSp() && !to.vndkdep.isVndkSp()) {
+ ctx.ModuleErrorf("(%s) should not link to %q(%s)",
+ vndk.typeName(), to.Name(), to.vndkdep.typeName())
+ return
+ }
+}