LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 4653cb89: cpufeatures license is BSD, no Apache 2.0

Browse Source 
Merge commit '4653cb897b8f52c1ead12a1bffa1ba40fd8f45a2' into eclair-plus-aosp

* commit '4653cb897b8f52c1ead12a1bffa1ba40fd8f45a2':
  cpufeatures license is BSD, no Apache 2.0
This commit is contained in:
David 'Digit' Turner
2010-02-22 16:35:29 -08:00
committed by Android Git Automerger
parent fda2f43891 4653cb897b
commit 528c8fa182
2 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ndk/sources/cpufeatures/cpu-features.c
View File

@@ -1,18 +1,29 @@
/* /*
* Copyright (C) 2010 The Android Open Source Project * Copyright (C) 2010 The Android Open Source Project
* All rights reserved.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Redistribution and use in source and binary forms, with or without
* you may not use this file except in compliance with the License. * modification, are permitted provided that the following conditions
* You may obtain a copy of the License at * are met:
* * * Redistributions of source code must retain the above copyright
* http://www.apache.org/licenses/LICENSE-2.0 * notice, this list of conditions and the following disclaimer.
* * * Redistributions in binary form must reproduce the above copyright
* Unless required by applicable law or agreed to in writing, software * notice, this list of conditions and the following disclaimer in
* distributed under the License is distributed on an "AS IS" BASIS, * the documentation and/or other materials provided with the
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * distribution.
* See the License for the specific language governing permissions and
* limitations under the License.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/ */
#include <sys/system_properties.h> #include <sys/system_properties.h>
#include <machine/cpu-features.h> #include <machine/cpu-features.h>

33
ndk/sources/cpufeatures/cpu-features.h
View File

@@ -1,18 +1,29 @@
/* /*
* Copyright (C) 2010 The Android Open Source Project * Copyright (C) 2010 The Android Open Source Project
* All rights reserved.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Redistribution and use in source and binary forms, with or without
* you may not use this file except in compliance with the License. * modification, are permitted provided that the following conditions
* You may obtain a copy of the License at * are met:
* * * Redistributions of source code must retain the above copyright
* http://www.apache.org/licenses/LICENSE-2.0 * notice, this list of conditions and the following disclaimer.
* * * Redistributions in binary form must reproduce the above copyright
* Unless required by applicable law or agreed to in writing, software * notice, this list of conditions and the following disclaimer in
* distributed under the License is distributed on an "AS IS" BASIS, * the documentation and/or other materials provided with the
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * distribution.
* See the License for the specific language governing permissions and
* limitations under the License.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/ */
#ifndef CPU_FEATURES_H #ifndef CPU_FEATURES_H
#define CPU_FEATURES_H #define CPU_FEATURES_H