No symbol versioning on Android

2 files changed, 22 insertions, 22 deletions

diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 7c537befef87..8497d1f5d3a6 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -101,7 +101,7 @@ $(USE_SHL1VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL1VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
 .ENDIF
 
@@ -140,7 +140,7 @@ $(USE_SHL1VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL1VERSIONMAP)"!=""
 USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
 .ENDIF
 
@@ -591,7 +591,7 @@ $(USE_SHL2VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL2VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
 .ENDIF
 
@@ -630,7 +630,7 @@ $(USE_SHL2VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL2VERSIONMAP)"!=""
 USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
 .ENDIF
 
@@ -1081,7 +1081,7 @@ $(USE_SHL3VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL3VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
 .ENDIF
 
@@ -1120,7 +1120,7 @@ $(USE_SHL3VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL3VERSIONMAP)"!=""
 USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
 .ENDIF
 
@@ -1571,7 +1571,7 @@ $(USE_SHL4VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL4VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
 .ENDIF
 
@@ -1610,7 +1610,7 @@ $(USE_SHL4VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL4VERSIONMAP)"!=""
 USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
 .ENDIF
 
@@ -2061,7 +2061,7 @@ $(USE_SHL5VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL5VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
 .ENDIF
 
@@ -2100,7 +2100,7 @@ $(USE_SHL5VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL5VERSIONMAP)"!=""
 USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
 .ENDIF
 
@@ -2551,7 +2551,7 @@ $(USE_SHL6VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL6VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
 .ENDIF
 
@@ -2590,7 +2590,7 @@ $(USE_SHL6VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL6VERSIONMAP)"!=""
 USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
 .ENDIF
 
@@ -3041,7 +3041,7 @@ $(USE_SHL7VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL7VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
 .ENDIF
 
@@ -3080,7 +3080,7 @@ $(USE_SHL7VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL7VERSIONMAP)"!=""
 USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
 .ENDIF
 
@@ -3531,7 +3531,7 @@ $(USE_SHL8VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL8VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
 .ENDIF
 
@@ -3570,7 +3570,7 @@ $(USE_SHL8VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL8VERSIONMAP)"!=""
 USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
 .ENDIF
 
@@ -4021,7 +4021,7 @@ $(USE_SHL9VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL9VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
 .ENDIF
 
@@ -4060,7 +4060,7 @@ $(USE_SHL9VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL9VERSIONMAP)"!=""
 USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
 .ENDIF
 
@@ -4511,7 +4511,7 @@ $(USE_SHL10VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL10VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
 .ENDIF
 
@@ -4550,7 +4550,7 @@ $(USE_SHL10VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL10VERSIONMAP)"!=""
 USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
 .ENDIF
 
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 111af2ae94fd..0c2882ca036d 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -130,7 +130,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL$(TNR)VERSIONMAP)"!=""
 
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
 .ENDIF
 
@@ -169,7 +169,7 @@ $(USE_SHL$(TNR)VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL$(TNR)VERSIONMAP)"!=""
 USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
+.IF "$(OS)" != "AIX" && "$(OS)" != "ANDROID"
 SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
 .ENDIF