Revert "Some clarifications in preparation to automatically order linker dependencies"
This reverts commit 2370af0e239555d891ef4fffd5597384c947f62e.
Reason for revert: New Build Breakage: aosp-master/aosp_arm64_ab-userdebug @ 4376965
Change-Id: Ibe4b819c4292457c454bf42e6d94fba3071ec04b
diff --git a/cc/library.go b/cc/library.go
index 60525a1..f1681db 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -155,7 +155,7 @@
}
func (f *flagExporter) exportedIncludes(ctx ModuleContext) android.Paths {
- if ctx.useVndk() && f.Properties.Target.Vendor.Export_include_dirs != nil {
+ if ctx.vndk() && f.Properties.Target.Vendor.Export_include_dirs != nil {
return android.PathsForModuleSrc(ctx, f.Properties.Target.Vendor.Export_include_dirs)
} else {
return android.PathsForModuleSrc(ctx, f.Properties.Export_include_dirs)
@@ -697,7 +697,7 @@
func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
if library.shared() {
if ctx.Device() {
- if ctx.useVndk() {
+ if ctx.vndk() {
if ctx.isVndkSp() {
library.baseInstaller.subDir = "vndk-sp"
} else if ctx.isVndk() {