Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AndroidSystemSEPolicy
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Werner Sembach
AndroidSystemSEPolicy
Commits
af2b0ab5
Commit
af2b0ab5
authored
Aug 31, 2016
by
Douglas Leung
Committed by
android-build-merger
Aug 31, 2016
Browse files
Options
Downloads
Plain Diff
Merge "Fix ioctl defines for Mips."
am:
9eac5ecb
Change-Id: I9f3bf66bd213cf5e870cc0e1ef0aa1b3ea6612f8
parents
31e64607
9eac5ecb
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Android.mk
+7
-0
7 additions, 0 deletions
Android.mk
ioctl_defines
+6
-6
6 additions, 6 deletions
ioctl_defines
with
13 additions
and
6 deletions
Android.mk
+
7
−
0
View file @
af2b0ab5
...
@@ -83,6 +83,12 @@ LOCAL_MODULE := sepolicy
...
@@ -83,6 +83,12 @@ LOCAL_MODULE := sepolicy
LOCAL_MODULE_CLASS
:=
ETC
LOCAL_MODULE_CLASS
:=
ETC
LOCAL_MODULE_TAGS
:=
optional
LOCAL_MODULE_TAGS
:=
optional
LOCAL_MODULE_PATH
:=
$(
TARGET_ROOT_OUT
)
LOCAL_MODULE_PATH
:=
$(
TARGET_ROOT_OUT
)
LOCAL_TARGET_ARCH
:=
$(
TARGET_ARCH
)
# Set LOCAL_TARGET_ARCH to mips for mips and mips64.
ifneq
(,$(filter mips mips64,$(TARGET_ARCH)))
LOCAL_TARGET_ARCH
:=
mips
endif
include
$(BUILD_SYSTEM)/base_rules.mk
include
$(BUILD_SYSTEM)/base_rules.mk
...
@@ -95,6 +101,7 @@ $(sepolicy_policy.conf): $(call build_policy, $(sepolicy_build_files))
...
@@ -95,6 +101,7 @@ $(sepolicy_policy.conf): $(call build_policy, $(sepolicy_build_files))
$(
hide
)
m4
$(
PRIVATE_ADDITIONAL_M4DEFS
)
\
$(
hide
)
m4
$(
PRIVATE_ADDITIONAL_M4DEFS
)
\
-D
mls_num_sens
=
$(
PRIVATE_MLS_SENS
)
-D
mls_num_cats
=
$(
PRIVATE_MLS_CATS
)
\
-D
mls_num_sens
=
$(
PRIVATE_MLS_SENS
)
-D
mls_num_cats
=
$(
PRIVATE_MLS_CATS
)
\
-D
target_build_variant
=
$(
TARGET_BUILD_VARIANT
)
\
-D
target_build_variant
=
$(
TARGET_BUILD_VARIANT
)
\
-D
target_arch
=
$(
LOCAL_TARGET_ARCH
)
\
-s
$^
>
$@
-s
$^
>
$@
$(
hide
)
sed
'/dontaudit/d'
$@
>
$@
.dontaudit
$(
hide
)
sed
'/dontaudit/d'
$@
>
$@
.dontaudit
...
...
This diff is collapsed.
Click to expand it.
ioctl_defines
+
6
−
6
View file @
af2b0ab5
...
@@ -389,7 +389,7 @@ define(`DVD_AUTH', `0x00005392')
...
@@ -389,7 +389,7 @@ define(`DVD_AUTH', `0x00005392')
define(`CDROM_SEND_PACKET', `0x00005393')
define(`CDROM_SEND_PACKET', `0x00005393')
define(`CDROM_NEXT_WRITABLE', `0x00005394')
define(`CDROM_NEXT_WRITABLE', `0x00005394')
define(`CDROM_LAST_WRITTEN', `0x00005395')
define(`CDROM_LAST_WRITTEN', `0x00005395')
define(`TCGETS',
`
0x00005401
'
)
define(`TCGETS',
ifelse(target_arch, mips, 0x0000540d,
0x00005401
)
)
define(`SNDCTL_TMR_START', `0x00005402')
define(`SNDCTL_TMR_START', `0x00005402')
define(`TCSETS', `0x00005402')
define(`TCSETS', `0x00005402')
define(`SNDCTL_TMR_STOP', `0x00005403')
define(`SNDCTL_TMR_STOP', `0x00005403')
...
@@ -408,17 +408,17 @@ define(`TIOCNXCL', `0x0000540d')
...
@@ -408,17 +408,17 @@ define(`TIOCNXCL', `0x0000540d')
define(`TIOCSCTTY', `0x0000540e')
define(`TIOCSCTTY', `0x0000540e')
define(`TIOCGPGRP', `0x0000540f')
define(`TIOCGPGRP', `0x0000540f')
define(`TIOCSPGRP', `0x00005410')
define(`TIOCSPGRP', `0x00005410')
define(`TIOCOUTQ',
`
0x00005411
'
)
define(`TIOCOUTQ',
ifelse(target_arch, mips, 0x00007472,
0x00005411
)
)
define(`TIOCSTI', `0x00005412')
define(`TIOCSTI', `0x00005412')
define(`TIOCGWINSZ',
`
0x00005413
'
)
define(`TIOCGWINSZ',
ifelse(target_arch, mips, 0x80087468,
0x00005413
)
)
define(`TIOCSWINSZ',
`
0x00005414
'
)
define(`TIOCSWINSZ',
ifelse(target_arch, mips, 0x40087467,
0x00005414
)
)
define(`TIOCMGET', `0x00005415')
define(`TIOCMGET', `0x00005415')
define(`TIOCMBIS', `0x00005416')
define(`TIOCMBIS', `0x00005416')
define(`TIOCMBIC', `0x00005417')
define(`TIOCMBIC', `0x00005417')
define(`TIOCMSET', `0x00005418')
define(`TIOCMSET', `0x00005418')
define(`TIOCGSOFTCAR', `0x00005419')
define(`TIOCGSOFTCAR', `0x00005419')
define(`TIOCSSOFTCAR', `0x0000541a')
define(`TIOCSSOFTCAR', `0x0000541a')
define(`FIONREAD',
`
0x0000541b
'
)
define(`FIONREAD',
ifelse(target_arch, mips, 0x0000467f,
0x0000541b
)
)
define(`TIOCLINUX', `0x0000541c')
define(`TIOCLINUX', `0x0000541c')
define(`TIOCCONS', `0x0000541d')
define(`TIOCCONS', `0x0000541d')
define(`TIOCGSERIAL', `0x0000541e')
define(`TIOCGSERIAL', `0x0000541e')
...
@@ -440,7 +440,7 @@ define(`TCSETXF', `0x00005434')
...
@@ -440,7 +440,7 @@ define(`TCSETXF', `0x00005434')
define(`TCSETXW', `0x00005435')
define(`TCSETXW', `0x00005435')
define(`TIOCVHANGUP', `0x00005437')
define(`TIOCVHANGUP', `0x00005437')
define(`FIONCLEX', `0x00005450')
define(`FIONCLEX', `0x00005450')
define(`FIOCLEX',
`
0x00005451
'
)
define(`FIOCLEX',
ifelse(target_arch, mips, 0x00006601,
0x00005451
)
)
define(`FIOASYNC', `0x00005452')
define(`FIOASYNC', `0x00005452')
define(`TIOCSERCONFIG', `0x00005453')
define(`TIOCSERCONFIG', `0x00005453')
define(`TIOCSERGWILD', `0x00005454')
define(`TIOCSERGWILD', `0x00005454')
...
...
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