Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 537e4af2 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "protobuf-3.9.1" 

* changes:
  Use installed paths of vndk libraries for ld.config.txt
  Adapt to google::protobuf::int64 type change
parents 9e4e275a 6dfc460a

adb/fastdeploy/deploypatchgenerator/deploy_patch_generator.cpp

+5 −5
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ void DeployPatchGenerator::Log(const char* fmt, ...) { 


void DeployPatchGenerator::APKEntryToLog(const APKEntry& entry) {

    Log("Filename: %s", entry.filename().c_str());

    Log("CRC32: 0x%08llX", entry.crc32());

    Log("Data Offset: %lld", entry.dataoffset());

    Log("Compressed Size: %lld", entry.compressedsize());

    Log("Uncompressed Size: %lld", entry.uncompressedsize());

    Log("CRC32: 0x%08" PRIX64, entry.crc32());

    Log("Data Offset: %" PRId64, entry.dataoffset());

    Log("Compressed Size: %" PRId64, entry.compressedsize());

    Log("Uncompressed Size: %" PRId64, entry.uncompressedsize());

}



void DeployPatchGenerator::APKMetaDataToLog(const char* file, const APKMetaData& metadata) {

rootdir/update_and_install_ld_config.mk

+20 −9
Original line number Diff line number Diff line
@@ -70,19 +70,30 @@ endif 
# /system image.

llndk_libraries_moved_to_apex_list:=$(LLNDK_MOVED_TO_APEX_LIBRARIES)



# Returns the unique installed basenames of a module, or module.so if there are

# none.  The guess is to handle cases like libc, where the module itself is

# marked uninstallable but a symlink is installed with the name libc.so.

# $(1): list of libraries

# $(2): output file to write the list of libraries to

# $(2): suffix to to add to each library (not used for guess)

define module-installed-files-or-guess

$(foreach lib,$(1),$(or $(strip $(sort $(notdir $(call module-installed-files,$(lib)$(2))))),$(lib).so))

endef



# $(1): list of libraries

# $(2): suffix to add to each library

# $(3): output file to write the list of libraries to

define write-libs-to-file

$(2): PRIVATE_LIBRARIES := $(1)

$(2):

	echo -n > $$@ && $$(foreach lib,$$(PRIVATE_LIBRARIES),echo $$(lib).so >> $$@;)

$(3): PRIVATE_LIBRARIES := $(1)

$(3): PRIVATE_SUFFIX := $(2)

$(3):

	echo -n > $$@ && $$(foreach so,$$(call module-installed-files-or-guess,$$(PRIVATE_LIBRARIES),$$(PRIVATE_SUFFIX)),echo $$(so) >> $$@;)

endef

$(eval $(call write-libs-to-file,$(llndk_libraries_list),$(llndk_libraries_file)))

$(eval $(call write-libs-to-file,$(vndksp_libraries_list),$(vndksp_libraries_file)))

$(eval $(call write-libs-to-file,$(VNDK_CORE_LIBRARIES),$(vndkcore_libraries_file)))

$(eval $(call write-libs-to-file,$(VNDK_PRIVATE_LIBRARIES),$(vndkprivate_libraries_file)))

$(eval $(call write-libs-to-file,$(llndk_libraries_list),,$(llndk_libraries_file)))

$(eval $(call write-libs-to-file,$(vndksp_libraries_list),.vendor,$(vndksp_libraries_file)))

$(eval $(call write-libs-to-file,$(VNDK_CORE_LIBRARIES),.vendor,$(vndkcore_libraries_file)))

$(eval $(call write-libs-to-file,$(VNDK_PRIVATE_LIBRARIES),.vendor,$(vndkprivate_libraries_file)))

ifeq ($(my_vndk_use_core_variant),true)

$(eval $(call write-libs-to-file,$(VNDK_USING_CORE_VARIANT_LIBRARIES),$(vndk_using_core_variant_libraries_file)))

$(eval $(call write-libs-to-file,$(VNDK_USING_CORE_VARIANT_LIBRARIES),,$(vndk_using_core_variant_libraries_file)))

endif

endif # ifneq ($(lib_list_from_prebuilts),true)