[FE training-materials-updates] Add Android.mk files to the upper directories so that the build system sees it

Maxime Ripard maxime.ripard at free-electrons.com
Mon May 19 12:03:18 CEST 2014


Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=782da670884f5407b8055634fda0da43d66dca3f

>---------------------------------------------------------------

commit 782da670884f5407b8055634fda0da43d66dca3f
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date:   Thu May 15 17:21:58 2014 +0200

    Add Android.mk files to the upper directories so that the build system sees it
    
    Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>


>---------------------------------------------------------------

782da670884f5407b8055634fda0da43d66dca3f
 lab-data/android/jni/frameworks/Android.mk         |   28 ++++++++++++++++++++
 lab-data/android/native-app/bin/Android.mk         |   28 ++++++++++++++++++++
 .../android/native-app/{ => bin/mlbin}/mlbin.c     |    0
 3 files changed, 56 insertions(+)

diff --git a/lab-data/android/jni/frameworks/Android.mk b/lab-data/android/jni/frameworks/Android.mk
new file mode 100644
index 0000000..20bfbaf
--- /dev/null
+++ b/lab-data/android/jni/frameworks/Android.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2011 The Android Open-Source Project
+#
+# 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.
+#
+
+# WARNING: Everything listed here will be built on ALL platforms,
+# including x86, the emulator, and the SDK.  Modules must be uniquely
+# named (liblights.panda), and must build everywhere, or limit themselves
+# to only building on ARM if they include assembly. Individual makefiles
+# are responsible for having their own logic, for fine-grained control.
+
+LOCAL_PATH := $(call my-dir)
+
+# if some modules are built directly from this directory (not subdirectories),
+# their rules should be written here.
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/lab-data/android/native-app/bin/Android.mk b/lab-data/android/native-app/bin/Android.mk
new file mode 100644
index 0000000..20bfbaf
--- /dev/null
+++ b/lab-data/android/native-app/bin/Android.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2011 The Android Open-Source Project
+#
+# 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.
+#
+
+# WARNING: Everything listed here will be built on ALL platforms,
+# including x86, the emulator, and the SDK.  Modules must be uniquely
+# named (liblights.panda), and must build everywhere, or limit themselves
+# to only building on ARM if they include assembly. Individual makefiles
+# are responsible for having their own logic, for fine-grained control.
+
+LOCAL_PATH := $(call my-dir)
+
+# if some modules are built directly from this directory (not subdirectories),
+# their rules should be written here.
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/lab-data/android/native-app/mlbin.c b/lab-data/android/native-app/bin/mlbin/mlbin.c
similarity index 100%
rename from lab-data/android/native-app/mlbin.c
rename to lab-data/android/native-app/bin/mlbin/mlbin.c



More information about the training-materials-updates mailing list