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

Commit 6cd1c8c2 authored by Joel Fernandes's avatar Joel Fernandes Committed by android-build-merger
Browse files

Merge "Remove ashmem from system/core" 

am: 3cc906b0

Change-Id: I26e1ff6a7702e7a9a420eaf180cca1f247b8715e
parents dcbf7185 3cc906b0

libmemunreachable/MemUnreachable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ bool MemUnreachable::ClassifyMappings(const allocator::vector<Mapping>& mappings 
    } else if (mapping_name == "[anon:libc_malloc]") {

      // named malloc mapping

      heap_mappings.emplace_back(*it);

    } else if (has_prefix(mapping_name, "/dev/ashmem/dalvik")) {

    } else if (has_prefix(mapping_name, "[anon:dalvik-")) {

      // named dalvik heap mapping

      globals_mappings.emplace_back(*it);

    } else if (has_prefix(mapping_name, "[stack")) {

libprocinfo/process_map_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ TEST(process_map, smoke) { 
  ASSERT_EQ(maps[0].end, 0x2ac00000ULL);

  ASSERT_EQ(maps[0].flags, PROT_READ | PROT_WRITE);

  ASSERT_EQ(maps[0].pgoff, 0ULL);

  ASSERT_EQ(maps[0].name, "/dev/ashmem/dalvik-main space (region space) (deleted)");

  ASSERT_EQ(maps[0].name, "[anon:dalvik-main space (region space)]");

  ASSERT_EQ(maps[876].start, 0x70e6c4f000ULL);

  ASSERT_EQ(maps[876].end, 0x70e6c6b000ULL);

  ASSERT_EQ(maps[876].flags, PROT_READ | PROT_EXEC);
@@ -55,6 +55,6 @@ TEST(process_map, smoke) { 
  ASSERT_EQ(maps[1260].flags, PROT_READ);

  ASSERT_EQ(maps[1260].pgoff, 0ULL);

  ASSERT_EQ(maps[1260].name,

            "/dev/ashmem/dalvik-classes.dex extracted in memory from "

            "/data/app/com.google.sample.tunnel-HGGRU03Gu1Mwkf_-RnFmvw==/base.apk (deleted)");

            "[anon:dalvik-classes.dex extracted in memory from "

            "/data/app/com.google.sample.tunnel-HGGRU03Gu1Mwkf_-RnFmvw==/base.apk]");

}

libprocinfo/testdata/maps

+314 −314

File changed.

Preview size limit exceeded, changes collapsed.