aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-05-14 13:35:02 -0700
committerDmitry Shmidt <dimitrysh@google.com>2012-05-14 13:35:02 -0700
commitc81d5b6205bf762093632de2cd7125de3d10eed5 (patch)
treec042504901ea0d3f31218234d7f1c56941e3f141
parent1029477547084d210cb810e8e5463c628972b315 (diff)
downloadandroid_external_wpa_supplicant_8-c81d5b6205bf762093632de2cd7125de3d10eed5.tar.gz
android_external_wpa_supplicant_8-c81d5b6205bf762093632de2cd7125de3d10eed5.tar.bz2
android_external_wpa_supplicant_8-c81d5b6205bf762093632de2cd7125de3d10eed5.zip
wpa_supplicant: Make Android makefiles available under the BSD license
Change-Id: I8d9e210748d582c6c5e3a62d47276c676ba74080 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--hostapd/Android.mk6
-rw-r--r--wpa_supplicant/Android.mk14
-rw-r--r--wpa_supplicant/wpa_supplicant_conf.mk13
-rwxr-xr-xwpa_supplicant/wpa_supplicant_conf.sh13
4 files changed, 12 insertions, 34 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 2be5e6e6..c1e5d8be 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 f1ccc2ee..4d11771b 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 ac842fd2..74986ea6 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 ec5e92fb..f36eef15 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.