diff options
-rw-r--r-- | Android.bp | 21 | ||||
-rw-r--r-- | LICENSE | 29 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | MODULE_LICENSE_BSD | 0 | ||||
-rw-r--r-- | hal/Android.bp | 10 | ||||
-rw-r--r-- | ipacm/Android.bp | 17 | ||||
-rw-r--r-- | ipacm/inc/IPACM_Netlink.h | 1 | ||||
-rw-r--r-- | ipacm/src/ipacm.rc | 2 | ||||
-rw-r--r-- | ipacm_vendor_product.mk | 4 | ||||
-rw-r--r-- | ipanat/Android.bp | 12 | ||||
-rw-r--r-- | ipanat/test/Android.mk | 5 | ||||
-rw-r--r-- | os_pickup.bp | 17 | ||||
-rw-r--r-- | os_pickup.mk | 15 |
13 files changed, 128 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..2ee14d2 --- /dev/null +++ b/Android.bp @@ -0,0 +1,21 @@ +soong_namespace { +} + +package { + default_applicable_licenses: [ + "hardware_qcom_sm8150_data_ipacfg-mgr_license", + ], +} + +// Added automatically by a large-scale-change +// http://go/android-license-faq +license { + name: "hardware_qcom_sm8150_data_ipacfg-mgr_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + ], + license_text: [ + "LICENSE", + ], +} @@ -0,0 +1,29 @@ +/* +Copyright (c) 2013 - 2017, The Linux Foundation. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/MODULE_LICENSE_BSD diff --git a/hal/Android.bp b/hal/Android.bp index 14d3745..1746da8 100644 --- a/hal/Android.bp +++ b/hal/Android.bp @@ -1,3 +1,13 @@ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "hardware_qcom_sm8150_data_ipacfg-mgr_license": + // SPDX-license-identifier-BSD + default_applicable_licenses: [ + "hardware_qcom_sm8150_data_ipacfg-mgr_license", + ], +} + cc_library_shared { name: "liboffloadhal", srcs: [ diff --git a/ipacm/Android.bp b/ipacm/Android.bp index 0ce21f7..6662fce 100644 --- a/ipacm/Android.bp +++ b/ipacm/Android.bp @@ -1,16 +1,27 @@ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "hardware_qcom_sm8150_data_ipacfg-mgr_license": + // SPDX-license-identifier-BSD + default_applicable_licenses: [ + "hardware_qcom_sm8150_data_ipacfg-mgr_license", + ], +} + cc_binary { name: "ipacm", local_include_dirs: ["src"] + ["inc"], - header_libs: ["qti_kernel_headers"], - - cflags: ["-v"] + ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [ + header_libs: ["device_kernel_headers"], + cflags: ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [ "-DFEATURE_IPACM_HAL", "-DDEBUG", "-Wall", "-Werror", "-Wno-error=macro-redefined", + "-Wno-enum-compare", + "-Wno-error=implicit-fallthrough", ], srcs: [ diff --git a/ipacm/inc/IPACM_Netlink.h b/ipacm/inc/IPACM_Netlink.h index ae3ab3f..7a1a939 100644 --- a/ipacm/inc/IPACM_Netlink.h +++ b/ipacm/inc/IPACM_Netlink.h @@ -52,7 +52,6 @@ extern "C" #include <sys/select.h> #include <sys/socket.h> #include <linux/socket.h> -#define sockaddr_storage __kernel_sockaddr_storage #include <linux/if.h> #include <linux/if_addr.h> #include <linux/rtnetlink.h> diff --git a/ipacm/src/ipacm.rc b/ipacm/src/ipacm.rc index 6b3bf98..b2658b6 100644 --- a/ipacm/src/ipacm.rc +++ b/ipacm/src/ipacm.rc @@ -31,4 +31,6 @@ service vendor.ipacm /system/vendor/bin/ipacm group radio inet on post-fs-data + mkdir /data/vendor/ipa 0770 radio radio + chmod 0770 /data/vendor/ipa start vendor.ipacm diff --git a/ipacm_vendor_product.mk b/ipacm_vendor_product.mk index 969d537..e18d519 100644 --- a/ipacm_vendor_product.mk +++ b/ipacm_vendor_product.mk @@ -17,7 +17,7 @@ BOARD_IPA_LOW_RAM_EXCP_LIST := bengal BOARD_IPA_LOW_RAM_EXCP_LIST += monaco ifeq ($(TARGET_HAS_LOW_RAM),true) -ifneq ($(call is-board-platform-in-list,$(BOARD_IPA_LOW_RAM_EXCP_LIST)),true) +ifeq (,$(call is-board-platform-in-list2,$(BOARD_IPA_LOW_RAM_EXCP_LIST))) TARGET_DISABLE_IPACM := true endif endif @@ -44,7 +44,7 @@ BOARD_IPAv3_LIST += bengal BOARD_ETH_BRIDGE_LIST := msmnile BOARD_ETH_BRIDGE_LIST += kona -ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true) +ifeq (,$(call is-board-platform-in-list2,$(BOARD_PLATFORM_LIST))) ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM))) ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH))) diff --git a/ipanat/Android.bp b/ipanat/Android.bp index 310304d..72ec1a8 100644 --- a/ipanat/Android.bp +++ b/ipanat/Android.bp @@ -1,9 +1,19 @@ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "hardware_qcom_sm8150_data_ipacfg-mgr_license": + // SPDX-license-identifier-BSD + default_applicable_licenses: [ + "hardware_qcom_sm8150_data_ipacfg-mgr_license", + ], +} + cc_library_shared { name: "libipanat", - header_libs: ["qti_kernel_headers"], + header_libs: ["device_kernel_headers"], srcs: [ "src/ipa_nat_drv.c", diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk index b8ae6a4..30b15b9 100644 --- a/ipanat/test/Android.mk +++ b/ipanat/test/Android.mk @@ -1,5 +1,5 @@ BOARD_PLATFORM_LIST := test -ifeq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true) +ifneq (,$(call is-board-platform-in-list2,$(BOARD_PLATFORM_LIST))) ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM))) ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH))) @@ -14,6 +14,9 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_MODULE := ipa_nat_test +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE LOCAL_SRC_FILES := ipa_nat_test000.c \ ipa_nat_test001.c \ ipa_nat_test002.c \ diff --git a/os_pickup.bp b/os_pickup.bp new file mode 100644 index 0000000..4cfddc8 --- /dev/null +++ b/os_pickup.bp @@ -0,0 +1,17 @@ +//hardware/qcom/sm8150/Android.bp links to this file +bootstrap_go_package { + name: "soong-display_defaults", + pkgPath: "android/soong/hardware/qcom/sm8150/display", + deps: [ + "blueprint", + "blueprint-pathtools", + "soong", + "soong-android", + "soong-cc", + "soong-genrule", + ], + srcs: [ + "display/display_defaults.go", + ], + pluginFor: ["soong_build"], +} diff --git a/os_pickup.mk b/os_pickup.mk new file mode 100644 index 0000000..59b5051 --- /dev/null +++ b/os_pickup.mk @@ -0,0 +1,15 @@ +ifneq ($(filter sm8150 sm7150,$(PRODUCT_PLATFORM)),) +ifneq ($(BUILD_WITHOUT_VENDOR), true) +LOCAL_PATH := $(call my-dir) +subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) + +ifeq ($(PRODUCT_PLATFORM),sm7150) +SKIP_BUILD_DIRS := \ + thermal +SKIP_MAKEFILES := $(call all-named-subdir-makefiles, $(SKIP_BUILD_DIRS)) +subdir_makefiles := $(filter-out $(SKIP_MAKEFILES), $(subdir_makefiles)) +endif + +$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) +endif +endif |