Add support for APP_STL

Change-Id: I2cc3035a8cc8b5a6426bf79ce61311ca0f854d81

3 files changed, 25 insertions, 4 deletions

diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/NdkConfigDsl.java b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/NdkConfigDsl.java
index 84476bd..0a5c79d 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/NdkConfigDsl.java
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/NdkConfigDsl.java
@@ -17,6 +17,7 @@
 package com.android.build.gradle.internal.dsl;
 
 import com.android.annotations.NonNull;
+import com.android.annotations.Nullable;
 import com.android.builder.NdkConfig;
 import com.google.common.collect.Sets;
 import org.gradle.api.tasks.Input;
@@ -35,6 +36,7 @@ public class NdkConfigDsl implements NdkConfig, Serializable {
     private String cFlags;
     private String ldLibs;
     private Set<String> abiFilters;
+    private String stl;
 
     public NdkConfigDsl() {
     }
@@ -116,4 +118,14 @@ public class NdkConfigDsl implements NdkConfig, Serializable {
         }
         return this;
     }
+
+    @Override
+    @Nullable
+    public String getStl() {
+        return stl;
+    }
+
+    public void setStl(String stl) {
+        this.stl = stl;
+    }
 }
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/NdkTask.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/NdkTask.groovy
index a051aed..cc5b5d2 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/NdkTask.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/NdkTask.groovy
@@ -28,21 +28,26 @@ class NdkTask extends BaseTask {
 
     @Input @Optional
     String getModuleName() {
-        return getNdkConfig()?.moduleName;
+        return getNdkConfig()?.moduleName
     }
 
     @Input @Optional
     String getcFlags() {
-        return getNdkConfig()?.cFlags;
+        return getNdkConfig()?.cFlags
     }
 
     @Input @Optional
     String getLdLibs() {
-        return getNdkConfig()?.ldLibs;
+        return getNdkConfig()?.ldLibs
     }
 
     @Input @Optional
     Set<String> getAbiFilters() {
-        return getNdkConfig()?.abiFilters;
+        return getNdkConfig()?.abiFilters
+    }
+
+    @Input @Optional
+    String getStl() {
+        return getNdkConfig().stl
     }
 }
diff --git a/gradle/src/main/groovy/com/android/build/gradle/tasks/NdkCompile.groovy b/gradle/src/main/groovy/com/android/build/gradle/tasks/NdkCompile.groovy
index 0a8e9b8..45d7d99 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/tasks/NdkCompile.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/tasks/NdkCompile.groovy
@@ -177,6 +177,10 @@ class NdkCompile extends NdkTask {
             commands.add("NDK_DEBUG=1")
         }
 
+        if (ndk.getStl() != null) {
+            commands.add("APP_STL=" + ndk.getStl())
+        }
+
         Set<String> abiFilters = ndk.abiFilters
         if (abiFilters != null && !abiFilters.isEmpty()) {
             if (abiFilters.size() == 1) {