Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
platform_frameworks_base-old
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Farzin Kazemzadeh
platform_frameworks_base-old
Commits
eaebd2cd
Commit
eaebd2cd
authored
3 years ago
by
Trevor Radcliffe
Committed by
Gerrit Code Review
3 years ago
Browse files
Options
Downloads
Plain Diff
Merge "Migrate rs/jni to Soong"
parents
41d4be0f
c2968df4
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
rs/jni/Android.bp
+54
-0
54 additions, 0 deletions
rs/jni/Android.bp
rs/jni/Android.mk
+0
-37
0 additions, 37 deletions
rs/jni/Android.mk
with
54 additions
and
37 deletions
rs/jni/Android.bp
0 → 100644
+
54
−
0
View file @
eaebd2cd
//
// Copyright (C) 2021 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.
//
package {
// See: http://go/android-license-faq
default_applicable_licenses: ["frameworks_base_license"],
}
cc_library_shared {
name: "librs_jni",
srcs: ["android_renderscript_RenderScript.cpp"],
shared_libs: [
"libandroid",
"libandroid_runtime",
"libandroidfw",
"libRS",
"libcutils",
"libhwui",
"liblog",
"libutils",
"libui",
"libgui",
"libjnigraphics",
],
header_libs: [
"jni_headers",
"libbase_headers",
],
include_dirs: ["frameworks/rs"],
cflags: [
"-Wno-unused-parameter",
"-Wunused",
"-Wunreachable-code",
"-Wno-deprecated-declarations",
],
}
This diff is collapsed.
Click to expand it.
rs/jni/Android.mk
deleted
100644 → 0
+
0
−
37
View file @
41d4be0f
LOCAL_PATH
:=
$(
call my-dir
)
include
$(CLEAR_VARS)
LOCAL_SRC_FILES
:=
\
android_renderscript_RenderScript.cpp
LOCAL_SHARED_LIBRARIES
:=
\
libandroid
\
libandroid_runtime
\
libandroidfw
\
libRS
\
libcutils
\
libhwui
\
liblog
\
libutils
\
libui
\
libgui
\
libjnigraphics
LOCAL_HEADER_LIBRARIES
:=
\
jni_headers
\
libbase_headers
LOCAL_C_INCLUDES
+=
\
frameworks/rs
LOCAL_CFLAGS
+=
-Wno-unused-parameter
LOCAL_CFLAGS
+=
-Wall
-Werror
-Wunused
-Wunreachable-code
-Wno-deprecated-declarations
LOCAL_MODULE
:=
librs_jni
LOCAL_LICENSE_KINDS
:=
SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS
:=
notice
LOCAL_NOTICE_FILE
:=
$(
LOCAL_PATH
)
/../../NOTICE
LOCAL_MODULE_TAGS
:=
optional
LOCAL_REQUIRED_MODULES
:=
libRS
include
$(BUILD_SHARED_LIBRARY)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment