diff options
| author | Ying Wang <wangying@google.com> | 2013-04-06 02:51:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-06 02:51:41 +0000 |
| commit | a48f77b5badf04bfcb9f9fe4839efda4f83309a2 (patch) | |
| tree | c5a9ca44b6271f07441bcd254772095f7f4aacde | |
| parent | 5656a481dd848a31bbd53c50773bfc9f3ee323ea (diff) | |
| parent | 0e4f6ee1514630a9e541d995e5ee8964ea79ef71 (diff) | |
| download | bison-a48f77b5badf04bfcb9f9fe4839efda4f83309a2.tar.gz | |
Merge "Don't set PKGDATADIR to an absolute path"
| -rw-r--r-- | Android.mk | 16 | ||||
| -rw-r--r-- | MODULE_LICENSE_GPL | 0 |
2 files changed, 12 insertions, 4 deletions
@@ -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_C_INCLUDES := \ $(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 00000000..e69de29b --- /dev/null +++ b/MODULE_LICENSE_GPL |