Merge "Don't set PKGDATADIR to an absolute path"
diff --git a/Android.mk b/Android.mk
index d5e877a..dc83178 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,11 +1,19 @@
-#
# Copyright 2006 The Android Open Source Project
#
-# Android Asset Packaging Tool
+# 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)
-LOCAL_PATH:= $(call my-dir)
###########################################
include $(CLEAR_VARS)
@@ -131,7 +139,7 @@
$(LOCAL_PATH)/$(BUILD_OS)-lib \
$(LOCAL_PATH)/lib
-LOCAL_CFLAGS := -DPKGDATADIR=\"$(PWD)/$(LOCAL_PATH)/data\"
+LOCAL_CFLAGS := -DPKGDATADIR=\"$(LOCAL_PATH)/data\"
LOCAL_STATIC_LIBRARIES := libbison
diff --git a/MODULE_LICENSE_GPL b/MODULE_LICENSE_GPL
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_GPL
