From 9a3a10ac819f456f7bcc626046342a845902fe96 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Fri, 12 Feb 2016 16:09:58 +0000 Subject: [PATCH] Add MODULE_LICENSE_GPL.. for art/runtime/openjdkjvm. This needs a companion makefile that declares a no-op module so that the build system can leach of its LOCAL_PATH to collect all subdirectory sources. bug: 27160386 Change-Id: Iac5321304ae68ac203eda8e4f7d5d81339dab851 --- Android.mk | 2 ++ runtime/openjdkjvm/Android.mk | 20 ++++++++++++++++++++ .../MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION | 0 3 files changed, 22 insertions(+) create mode 100644 runtime/openjdkjvm/Android.mk create mode 100644 runtime/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION diff --git a/Android.mk b/Android.mk index 4f7312712..2e05d3320 100644 --- a/Android.mk +++ b/Android.mk @@ -547,3 +547,5 @@ endif # !art_dont_bother art_dont_bother := art_test_bother := TEST_ART_TARGET_SYNC_DEPS := + +include $(art_path)/runtime/openjdkjvm/Android.mk diff --git a/runtime/openjdkjvm/Android.mk b/runtime/openjdkjvm/Android.mk new file mode 100644 index 000000000..9b7404ebf --- /dev/null +++ b/runtime/openjdkjvm/Android.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2016 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 := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := openjdkjvm-phony +include $(BUILD_PHONY_PACKAGE) diff --git a/runtime/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION b/runtime/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION new file mode 100644 index 000000000..e69de29bb -- 2.11.0