tequilaOS/platform_external_mksh
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Move sh_vendor cflags to its own target"

Browse source 
am: f74f8d48e2

Change-Id: Idbfe973bc99c3afaabf9e36d5be2607c352d2287
This commit is contained in:
Sandeep Patil 2017-11-11 00:42:59 +00:00 committed by android-build-merger
commit ecaf5bfb46
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Android.bp
View file

@ -116,20 +116,6 @@ cc_defaults {
"-DMKSH_DEFAULT_EXECSHELL=\"/system/bin/sh\"",
"-DMKSH_DEFAULT_TMPDIR=\"/data/local\"",
],
target: {
vendor: {
cflags: [
// Additional flags for vendor variant
"-UMKSH_DEFAULT_PROFILEDIR",
"-UMKSHRC_PATH",
"-UMKSH_DEFAULT_EXECSHELL",
"-DMKSH_DEFAULT_PROFILEDIR=\"/vendor/etc\"",
"-DMKSHRC_PATH=\"/vendor/etc/mkshrc\"",
"-DMKSH_DEFAULT_EXECSHELL=\"/vendor/bin/sh\"",
"-DMKSH_DEFPATH_OVERRIDE=\"/vendor/bin:/vendor/xbin\"",
],
},
},
}
cc_binary {
@ -142,4 +128,14 @@ cc_binary {
defaults: ["sh-defaults"],
stem: "sh",
vendor: true,
cflags: [
// Additional flags for vendor variant
"-UMKSH_DEFAULT_PROFILEDIR",
"-UMKSHRC_PATH",
"-UMKSH_DEFAULT_EXECSHELL",
"-DMKSH_DEFAULT_PROFILEDIR=\"/vendor/etc\"",
"-DMKSHRC_PATH=\"/vendor/etc/mkshrc\"",
"-DMKSH_DEFAULT_EXECSHELL=\"/vendor/bin/sh\"",
"-DMKSH_DEFPATH_OVERRIDE=\"/vendor/bin:/vendor/xbin\"",
],
}