summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-06-09 11:33:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-09 11:33:36 -0700
commitab251d9c80bdffb53605437c9c18c2d0ee40aa24 (patch)
treeb48a638a1a56baf370a60e7bd8adcdd5e832a35e /tools
parentd35e7f5aabece678ddb3106e546db76ad0315eb2 (diff)
parent7a7942899eedde3b946768a155fac3d70af5c9c3 (diff)
downloadbuild-ab251d9c80bdffb53605437c9c18c2d0ee40aa24.zip
build-ab251d9c80bdffb53605437c9c18c2d0ee40aa24.tar.gz
build-ab251d9c80bdffb53605437c9c18c2d0ee40aa24.tar.bz2
am 7a794289: Merge "Unbundle the build system." into froyo
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into froyo-plus-aosp * commit '7a7942899eedde3b946768a155fac3d70af5c9c3': Unbundle the build system.
Diffstat (limited to 'tools')
-rw-r--r--tools/Android.mk23
1 files changed, 23 insertions, 0 deletions
diff --git a/tools/Android.mk b/tools/Android.mk
new file mode 100644
index 0000000..aea2785
--- /dev/null
+++ b/tools/Android.mk
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(my-dir)
+
+ifeq ($(strip $(is_unbundled_app_build)),true)
+include $(LOCAL_PATH)/signapk/Android.mk
+else
+include $(call first-makefiles-under,$(LOCAL_PATH))
+endif