Merge pull request #33 from adrianosantostreina/develop

no message
adrianosantostreina · Dec 13, 2022 · e0ef5df · e0ef5df
2 parents 3c5274c + 332dc52
commit e0ef5df
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/Package/MobilePermissions.dpk b/Package/MobilePermissions.dpk
@@ -1,5 +1,4 @@
 package MobilePermissions;
-
 {$R *.res}
 {$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
 {$ALIGN 8}

diff --git a/Package/MobilePermissions.dproj b/Package/MobilePermissions.dproj
@@ -76,7 +76,6 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <DCC_DcuOutput>$(BDS)\lib\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <DCC_E>false</DCC_E>
         <DCC_N>false</DCC_N>
@@ -90,8 +89,6 @@
         <SanitizedProjectName>MobilePermissions</SanitizedProjectName>
         <VerInfo_Locale>1046</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-        <DCC_DcpOutput>$(BDS)\lib\$(Platform)\$(Config)</DCC_DcpOutput>
-        <DCC_BplOutput>$(BDS)\lib\$(Platform)\$(Config)</DCC_BplOutput>
         <AUP_CAMERA>true</AUP_CAMERA>
         <AUP_INSTALL_SHORTCUT>true</AUP_INSTALL_SHORTCUT>
         <AUP_INSTANT_APP_FOREGROUND_SERVICE>true</AUP_INSTANT_APP_FOREGROUND_SERVICE>
@@ -133,9 +130,6 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <DCC_UsePackage>rtl;fmx;$(DCC_UsePackage)</DCC_UsePackage>
-        <DCC_DcpOutput>$(BDSCatalogRepository)\MobilePermissions\bpl</DCC_DcpOutput>
-        <DCC_BplOutput>$(BDSCatalogRepository)\MobilePermissions\bpl</DCC_BplOutput>
-        <DCC_DcuOutput>$(BDSCatalogRepository)\MobilePermissions\dcu</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
@@ -194,7 +188,6 @@
         <DCCReference Include="..\Source\MobilePermissions.Permissions.Factory.pas"/>
         <DCCReference Include="..\Source\Component\MobilePermissions.Component.Editor.Help.pas">
             <Form>frmMobilePermissionsHelp</Form>
-            <FormType>fmx</FormType>
         </DCCReference>
         <DCCReference Include="..\Source\Component\MobilePermissions.Component.Editor.pas"/>
         <DCCReference Include="..\Source\Component\MobilePermissions.Component.pas"/>
@@ -221,7 +214,9 @@
                 <Source>
                     <Source Name="MainSource">MobilePermissions.dpk</Source>
                 </Source>
-                <Excluded_Packages/>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\adria\OneDrive\Documentos\Embarcadero\Studio\22.0\CatalogRepository\ADRFirebase\bpl\pkgADRFirebaseAuthentication.bpl">File C:\Users\adria\OneDrive\Documentos\Embarcadero\Studio\22.0\CatalogRepository\ADRFirebase\bpl\pkgADRFirebaseAuthentication.bpl not found</Excluded_Packages>
+                </Excluded_Packages>
             </Delphi.Personality>
             <Deployment Version="4">
                 <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">

diff --git a/Source/MobilePermissions.JNI.Os.Base.pas b/Source/MobilePermissions.JNI.Os.Base.pas
@@ -170,7 +170,7 @@ implementation
 
 function TMobilePermissionsManifest.ACCESS_CHECKIN_PROPERTIES: JavaString;
 begin
-  Result := EmptyStr;
+  Result := ''; //EmptyStr;
 end;
 
 function TMobilePermissionsManifest.ACCESS_COARSE_LOCATION: JavaString;