Snap for 11841552 from 865961d8ccb45a95a45ca3051f1c8cb4124402f2 to sdk-releasesdk-release

Change-Id: I46db8257a1731cb43843cb0edcde24692b8cd8b2

18 files changed, 0 insertions, 697 deletions

diff --git a/firmware/app/Android.mk b/firmware/app/Android.mk
deleted file mode 100644
index e6bbbc1e..00000000
--- a/firmware/app/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-subdirs := test0.app test1.app chre
-include $(call all-named-subdir-makefiles,$(subdirs))
diff --git a/firmware/app/chre/Android.mk b/firmware/app/chre/Android.mk
deleted file mode 100644
index 54d18ee0..00000000
--- a/firmware/app/chre/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/firmware/app/chre/chre_test0.app/Android.mk b/firmware/app/chre/chre_test0.app/Android.mk
deleted file mode 100644
index 4eb25cd4..00000000
--- a/firmware/app/chre/chre_test0.app/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := chre_test0
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_MODULE_TAGS := optional
-
-# Googl + T + 0x9000
-LOCAL_NANO_APP_ID := 476f6f676c549000
-LOCAL_NANO_APP_VERSION := 0
-
-LOCAL_SRC_FILES := main.c
-
-include $(BUILD_NANOHUB_APP_CHRE_EXECUTABLE)
diff --git a/firmware/app/chre/chre_test1.app/Android.mk b/firmware/app/chre/chre_test1.app/Android.mk
deleted file mode 100644
index 59fd063e..00000000
--- a/firmware/app/chre/chre_test1.app/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := chre_test1
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_MODULE_TAGS := optional
-
-# Googl + T + 0x9001
-LOCAL_NANO_APP_ID := 476f6f676c549001
-LOCAL_NANO_APP_VERSION := 0
-
-LOCAL_SRC_FILES := \
-    main.cpp \
-
-include $(BUILD_NANOHUB_APP_CHRE_EXECUTABLE)
diff --git a/firmware/app/chre/chre_test2.app/Android.mk b/firmware/app/chre/chre_test2.app/Android.mk
deleted file mode 100644
index 5631b000..00000000
--- a/firmware/app/chre/chre_test2.app/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := chre_test2
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_MODULE_TAGS := optional
-
-# Googl + T + 0x9002
-LOCAL_NANO_APP_ID := 476f6f676c549002
-LOCAL_NANO_APP_VERSION := 0
-
-LOCAL_SRC_FILES := \
-    main.cpp \
-
-include $(BUILD_NANOHUB_APP_CHRE_EXECUTABLE)
diff --git a/firmware/app/chre/common/Android.mk b/firmware/app/chre/common/Android.mk
deleted file mode 100644
index 9e230a0d..00000000
--- a/firmware/app/chre/common/Android.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-########################################################
-# CHRE 1.0 Library
-########################################################
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanochre10
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES :=      \
-    chre10_app.c          \
-    chre10_app_syscalls.c \
-
-LOCAL_STATIC_LIBRARIES += libnanobuiltins
-LOCAL_STATIC_LIBRARIES += libnanolibc
-
-include $(BUILD_NANOHUB_APP_STATIC_LIBRARY)
-
-########################################################
-# CHRE 1.1 Library
-########################################################
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanochre11
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES :=      \
-    chre_app.c          \
-    chre11_app_syscalls.c \
-
-LOCAL_STATIC_LIBRARIES += libnanobuiltins
-LOCAL_STATIC_LIBRARIES += libnanolibc
-
-include $(BUILD_NANOHUB_APP_STATIC_LIBRARY)
-
-########################################################
-# CHRE 1.2 Library
-########################################################
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanochre
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES :=      \
-    chre_app.c          \
-    chre_app_syscalls.c \
-
-LOCAL_STATIC_LIBRARIES += libnanobuiltins
-LOCAL_STATIC_LIBRARIES += libnanolibc
-
-include $(BUILD_NANOHUB_APP_STATIC_LIBRARY)
diff --git a/firmware/app/test0.app/Android.mk b/firmware/app/test0.app/Android.mk
deleted file mode 100644
index 10beea86..00000000
--- a/firmware/app/test0.app/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := test0
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
-LOCAL_MODULE_TAGS := optional
-
-# Googl + T + 0x8000
-LOCAL_NANO_APP_ID := 476f6f676c548000
-LOCAL_NANO_APP_VERSION := 0
-
-LOCAL_SRC_FILES := test_app0.c
-
-include $(BUILD_NANOHUB_APP_EXECUTABLE)
diff --git a/firmware/app/test1.app/Android.mk b/firmware/app/test1.app/Android.mk
deleted file mode 100644
index f7875fe3..00000000
--- a/firmware/app/test1.app/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := test1
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
-LOCAL_MODULE_TAGS := optional
-
-# Googl + T + 0x8000
-LOCAL_NANO_APP_ID := 476f6f676c548001
-LOCAL_NANO_APP_VERSION := 0
-
-LOCAL_SRC_FILES := test_app1.c
-
-include $(BUILD_NANOHUB_APP_EXECUTABLE)
diff --git a/firmware/os/cpu/cortexm4/Android.mk b/firmware/os/cpu/cortexm4/Android.mk
deleted file mode 100644
index 3abbf949..00000000
--- a/firmware/os/cpu/cortexm4/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-########################################################
-# COMMON OS & BL defs
-########################################################
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_bl_cortexm4
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_AUX_CPU := cortexm4
-
-LOCAL_SRC_FILES := \
-    atomic.c \
-    atomicBitset.c \
-    cpu.c \
-
-include $(BUILD_NANOHUB_BL_STATIC_LIBRARY)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_os_cortexm4
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_AUX_CPU := cortexm4
-
-LOCAL_SRC_FILES := \
-    appSupport.c \
-    atomic.c \
-    atomicBitset.c \
-    cpu.c \
-    cpuMath.c \
-    pendsv.c \
-
-include $(BUILD_NANOHUB_OS_STATIC_LIBRARY)
diff --git a/firmware/os/cpu/x86/Android.mk b/firmware/os/cpu/x86/Android.mk
deleted file mode 100644
index 4b7afcb3..00000000
--- a/firmware/os/cpu/x86/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-########################################################
-# COMMON OS & BL defs
-########################################################
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_os_x86
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_AUX_CPU := x86
-
-LOCAL_SRC_FILES := \
-    atomic.c \
-    atomicBitset.c \
-    cpu.c \
-
-include $(BUILD_NANOHUB_OS_STATIC_LIBRARY)
diff --git a/firmware/os/platform/native/Android.mk b/firmware/os/platform/native/Android.mk
deleted file mode 100644
index 4dae4ffb..00000000
--- a/firmware/os/platform/native/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-NANOHUB_PALTFORM_PATH := $(LOCAL_PATH)
-
-########################################################
-# NANOHUB OS BINARY
-########################################################
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_os_native
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_AUX_ARCH := native
-
-LOCAL_SRC_FILES := \
-    hostIntf.c \
-    i2c.c \
-    platform.c \
-    rtc.c \
-    spi.c \
-
-include $(BUILD_NANOHUB_OS_STATIC_LIBRARY)
diff --git a/firmware/os/platform/stm32/Android.mk b/firmware/os/platform/stm32/Android.mk
deleted file mode 100644
index 346a7e70..00000000
--- a/firmware/os/platform/stm32/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-########################################################
-# COMMON OS & BL defs
-########################################################
-
-NANOHUB_PALTFORM_PATH := $(LOCAL_PATH)
-
-########################################################
-# BOOT LOADER BINARY
-########################################################
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_bl_stm32
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_AUX_ARCH := stm32
-
-LOCAL_SRC_FILES :=      \
-    bl.c                \
-    gpio.c              \
-    pwr.c               \
-
-include $(BUILD_NANOHUB_BL_STATIC_LIBRARY)
-
-########################################################
-# NANOHUB OS BINARY
-########################################################
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_os_stm32
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE
-LOCAL_AUX_ARCH := stm32
-
-LOCAL_SRC_FILES := \
-    apInt.c \
-    crc.c \
-    crt_stm32.c \
-    dma.c \
-    eeData.c \
-    exti.c \
-    gpio.c \
-    hostIntf.c \
-    i2c.c \
-    mpu.c \
-    platform.c \
-    pwr.c \
-    rtc.c \
-    spi.c \
-    syscfg.c \
-    usart.c \
-    wdt.c \
-
-include $(BUILD_NANOHUB_OS_STATIC_LIBRARY)
diff --git a/firmware/variant/Android.mk b/firmware/variant/Android.mk
deleted file mode 100644
index 2321334a..00000000
--- a/firmware/variant/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-subdirs := nucleo lunchbox linux neonkey argonkey
-include $(call all-named-subdir-makefiles,$(subdirs))
diff --git a/firmware/variant/argonkey/Android.mk b/firmware/variant/argonkey/Android.mk
deleted file mode 100644
index 17f60af8..00000000
--- a/firmware/variant/argonkey/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_os_argonkey
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
-LOCAL_MODULE_TAGS := optional
-LOCAL_AUX_OS_VARIANT := argonkey
-
-LOCAL_SRC_FILES :=      \
-    src/os/i2c.c        \
-    src/os/led.c        \
-    src/os/spi.c        \
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/inc \
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_C_INCLUDES)
-
-include $(BUILD_NANOHUB_OS_STATIC_LIBRARY)
diff --git a/firmware/variant/linux/Android.mk b/firmware/variant/linux/Android.mk
deleted file mode 100644
index 79e1eeb9..00000000
--- a/firmware/variant/linux/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_os_linux
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
-LOCAL_MODULE_TAGS := optional
-LOCAL_AUX_OS_VARIANT := linux
-
-LOCAL_SRC_FILES :=      \
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/inc \
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_C_INCLUDES)
-
-include $(BUILD_NANOHUB_OS_STATIC_LIBRARY)
diff --git a/firmware/variant/lunchbox/Android.mk b/firmware/variant/lunchbox/Android.mk
deleted file mode 100644
index f157e17f..00000000
--- a/firmware/variant/lunchbox/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_os_lunchbox
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
-LOCAL_MODULE_TAGS := optional
-LOCAL_AUX_OS_VARIANT := lunchbox
-
-LOCAL_SRC_FILES :=      \
-    src/os/i2c.c        \
-    src/os/spi.c        \
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/inc \
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_C_INCLUDES)
-
-include $(BUILD_NANOHUB_OS_STATIC_LIBRARY)
diff --git a/firmware/variant/neonkey/Android.mk b/firmware/variant/neonkey/Android.mk
deleted file mode 100644
index 5f01e261..00000000
--- a/firmware/variant/neonkey/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_os_neonkey
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
-LOCAL_MODULE_TAGS := optional
-LOCAL_AUX_OS_VARIANT := neonkey
-
-LOCAL_SRC_FILES :=      \
-    src/os/i2c.c        \
-    src/os/spi.c        \
-    src/os/led.c
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/inc \
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_C_INCLUDES)
-
-include $(BUILD_NANOHUB_OS_STATIC_LIBRARY)
diff --git a/firmware/variant/nucleo/Android.mk b/firmware/variant/nucleo/Android.mk
deleted file mode 100644
index 043bed7e..00000000
--- a/firmware/variant/nucleo/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_NANO_VARS)
-
-LOCAL_MODULE := libnanohub_os_nucleo
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
-LOCAL_MODULE_TAGS := optional
-LOCAL_AUX_OS_VARIANT := nucleo
-
-LOCAL_SRC_FILES :=      \
-    src/os/i2c.c        \
-    src/os/spi.c        \
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/inc \
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_C_INCLUDES)
-
-include $(BUILD_NANOHUB_OS_STATIC_LIBRARY)