From dfb42efb349e0a5d50126aa2fcf5653e11a01b59 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 14 May 2012 20:34:24 -0400 Subject: [PATCH] wpa_supplicant: Make Android makefiles available under the BSD license Signed-off-by: Dmitry Shmidt --- hostapd/Android.mk | 6 ++++++ wpa_supplicant/Android.mk | 14 ++------------ wpa_supplicant/wpa_supplicant_conf.mk | 13 ++----------- wpa_supplicant/wpa_supplicant_conf.sh | 13 ++----------- 4 files changed, 12 insertions(+), 34 deletions(-) diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 4470b9f72..543c15231 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -1,3 +1,9 @@ +# Copyright (C) 2008 The Android Open Source Project +# +# This software may be distributed under the terms of the BSD license. +# See README for more details. +# + LOCAL_PATH := $(call my-dir) WPA_BUILD_HOSTAPD := false diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 1080ef0ab..e611d36f2 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -1,18 +1,8 @@ # # Copyright (C) 2008 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. -# +# This software may be distributed under the terms of the BSD license. +# See README for more details. # LOCAL_PATH := $(call my-dir) diff --git a/wpa_supplicant/wpa_supplicant_conf.mk b/wpa_supplicant/wpa_supplicant_conf.mk index ac842fd2f..74986ea6e 100644 --- a/wpa_supplicant/wpa_supplicant_conf.mk +++ b/wpa_supplicant/wpa_supplicant_conf.mk @@ -1,17 +1,8 @@ # # Copyright (C) 2010 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. +# This software may be distributed under the terms of the BSD license. +# See README for more details. # # Include this makefile to generate your hardware specific wpa_supplicant.conf diff --git a/wpa_supplicant/wpa_supplicant_conf.sh b/wpa_supplicant/wpa_supplicant_conf.sh index ec5e92fbc..f36eef153 100755 --- a/wpa_supplicant/wpa_supplicant_conf.sh +++ b/wpa_supplicant/wpa_supplicant_conf.sh @@ -2,17 +2,8 @@ # # Copyright (C) 2010 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. +# This software may be distributed under the terms of the BSD license. +# See README for more details. # # Generate a wpa_supplicant.conf from the template.