From beeadda28642792e0c6e79fd842c891882ec9c9b Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 5 Apr 2013 17:13:53 -0700 Subject: Don't set PKGDATADIR to an absolute path For we are going to check in a prebuilt bison to the source tree, it makes no sense to embed a full absolute path in the bison binary. That means you can run the built bison only from the top of the source tree. To run it from somewhere else, you need to set up environmental variable BISON_PKGDATADIR. Bug: 8517572 Change-Id: Iaa81b30781a6a9162c775cdadaa759dad79a179d --- Android.mk | 16 ++++++++++++---- MODULE_LICENSE_GPL | 0 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 MODULE_LICENSE_GPL diff --git a/Android.mk b/Android.mk index d5e877a5..dc831786 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_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 -- cgit v1.2.3