aboutsummaryrefslogtreecommitdiff
path: root/android_test
diff options
context:
space:
mode:
authorHugues Evrard <hevrard@users.noreply.github.com>2019-02-14 15:21:05 +0000
committerdan sinclair <dj2@everburning.com>2019-02-14 10:21:05 -0500
commitb053505276eb86fd23d17028f0c51d7a284d4a8f (patch)
treedb010c165f9617744639b84acdfa9de7238c278c /android_test
parent4aed92c264a953d96a87c113ad51659e009d1217 (diff)
downloadamber-b053505276eb86fd23d17028f0c51d7a284d4a8f.tar.gz
Add compilation scaffolding for plain Android executable (#285)
Diffstat (limited to 'android_test')
-rw-r--r--android_test/Android.mk14
-rw-r--r--android_test/jni/Application.mk16
2 files changed, 29 insertions, 1 deletions
diff --git a/android_test/Android.mk b/android_test/Android.mk
index 38a77f6..0419997 100644
--- a/android_test/Android.mk
+++ b/android_test/Android.mk
@@ -1,3 +1,17 @@
+# Copyright 2019 The Amber Authors.
+#
+# 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.
+
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
diff --git a/android_test/jni/Application.mk b/android_test/jni/Application.mk
index 55e50fb..e17fb4c 100644
--- a/android_test/jni/Application.mk
+++ b/android_test/jni/Application.mk
@@ -1,4 +1,18 @@
-APP_ABI := armeabi-v7a
+# Copyright 2019 The Amber Authors.
+#
+# 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.
+
+APP_ABI := arm64-v8a # armeabi-v7a x86 x86_64
APP_BUILD_SCRIPT := Android.mk
APP_STL := c++_static
APP_PLATFORM := android-14