diff options
author | 2015-12-20 20:32:01 +0000 | |
---|---|---|
committer | 2015-12-21 16:58:01 +0000 | |
commit | 28ee8dbece62bf1ed9a7dfd3c581fd5860ed8867 (patch) | |
tree | 1cfd6b4c67eb6c276d5aa22abda9306ee2d4f985 | |
parent | d5aeb13585f682f9090b76eb9d5878bec801f9af (diff) |
Update header for OpenjdkJvm.cc.
Change-Id: I19d25531fe71d0511ee3887a2ffd5697a8a00249
-rw-r--r-- | NOTICE | 34 | ||||
-rw-r--r-- | runtime/native/OpenjdkJvm.cc | 37 |
2 files changed, 60 insertions, 11 deletions
@@ -264,3 +264,37 @@ ARM contributions llvm/lib/Target/ARM/LICENSE.TXT md5 contributions llvm/lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h ------------------------------------------------------------------- + +For art/runtime/OpenjdkJvm.cc (libopenjdkjvm.so) + +Copyright (C) 2014 The Android Open Source Project +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + +This file implements interfaces from the file jvm.h. This implementation +is licensed under the same terms as the file jvm.h. The +copyright and license information for the file jvm.h follows. + +Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + +This code is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License version 2 only, as +published by the Free Software Foundation. Oracle designates this +particular file as subject to the "Classpath" exception as provided +by Oracle in the LICENSE file that accompanied this code. + +This code is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +version 2 for more details (a copy is included in the LICENSE file that +accompanied this code). + +You should have received a copy of the GNU General Public License version +2 along with this work; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +or visit www.oracle.com if you need additional information or have any +questions. + +------------------------------------------------------------------- diff --git a/runtime/native/OpenjdkJvm.cc b/runtime/native/OpenjdkJvm.cc index 66ee9fb043..db9ad5cb83 100644 --- a/runtime/native/OpenjdkJvm.cc +++ b/runtime/native/OpenjdkJvm.cc @@ -1,17 +1,32 @@ -/* - * Copyright (C) 2014 The Android Open Source Project +/* Copyright (C) 2014 The Android Open Source Project + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This file implements interfaces from the file jvm.h. This implementation + * is licensed under the same terms as the file jvm.h. The + * copyright and license information for the file jvm.h follows. + * + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. * - * 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 + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). * - * http://www.apache.org/licenses/LICENSE-2.0 + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * 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. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. */ /* |