@@ -163,26 +163,27 @@ void HackMakeArchiveItem (NativeRuntimeComponents.Archive archive, List<ITaskIte
163
163
var relativeArtifactPaths = new List < ( string path , string abi ) > ( ) ;
164
164
string archiveName = Path . GetFileName ( archive . Name ) ;
165
165
string commonClrObjDir = Path . Combine ( "artifacts" , "obj" , "coreclr" ) ;
166
+ const string config = "Release" ; // or Debug
166
167
167
168
if ( IsArchive ( "libcoreclr.a" ) ) {
168
169
archiveName = "libcoreclr_static.a" ;
169
- MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .Release ", "dlls" , "mscoree" , "coreclr" ) ) ;
170
+ MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .{ config } ", "dlls" , "mscoree" , "coreclr" ) ) ;
170
171
} else if ( IsArchive ( "libcoreclrpal.a" ) ) {
171
- MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .Release ", "pal" , "src" ) ) ;
172
+ MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .{ config } ", "pal" , "src" ) ) ;
172
173
} else if ( IsArchive ( "libminipal.a" ) ) {
173
- MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .Release ", "shared_minipal" ) ) ;
174
+ MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .{ config } ", "shared_minipal" ) ) ;
174
175
} else if ( IsArchive ( "libcoreclrminipal.a" ) ) {
175
- MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .Release ", "minipal" , "Unix" ) ) ;
176
+ MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .{ config } ", "minipal" , "Unix" ) ) ;
176
177
} else if ( IsArchive ( "libgc_pal.a" ) ) {
177
- MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .Release ", "gc" , "unix" ) ) ;
178
+ MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .{ config } ", "gc" , "unix" ) ) ;
178
179
} else if ( IsArchive ( "libeventprovider.a" ) ) {
179
- MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .Release ", "pal" , "src" , "eventprovider" , "dummyprovider" ) ) ;
180
+ MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .{ config } ", "pal" , "src" , "eventprovider" , "dummyprovider" ) ) ;
180
181
} else if ( IsArchive ( "libnativeresourcestring.a" ) ) {
181
- MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .Release ", "nativeresources" ) ) ;
182
+ MakeRelativeArtifactPaths ( ( string clrArch ) => Path . Combine ( commonClrObjDir , $ "android.{ clrArch } .{ config } ", "nativeresources" ) ) ;
182
183
} else {
183
184
foreach ( string abi in uniqueAbis ) {
184
185
string clrArch = GetClrArch ( abi ) ;
185
- relativeArtifactPaths . Add ( ( Path . Combine ( "artifacts" , "bin" , $ "microsoft.netcore.app.runtime.android-{ clrArch } ", "Release" , "runtimes" , $ "android-{ clrArch } ", "native" ) , abi ) ) ;
186
+ relativeArtifactPaths . Add ( ( Path . Combine ( "artifacts" , "bin" , $ "microsoft.netcore.app.runtime.android-{ clrArch } ", config , "runtimes" , $ "android-{ clrArch } ", "native" ) , abi ) ) ;
186
187
}
187
188
}
188
189
0 commit comments